New upstream version 18.11-rc1

[deb_dpdk.git] / drivers / net / sfc / base / medford2_nic.c

diff --git a/drivers/net/sfc/base/medford2_nic.c b/drivers/net/sfc/base/medford2_nic.c
index 7f5ad17..6bc1e87 100644 (file)
--- a/drivers/net/sfc/base/medford2_nic.c
+++ b/drivers/net/sfc/base/medford2_nic.c
@@ -15,25 +15,15 @@ medford2_nic_get_required_pcie_bandwidth(
        __in            efx_nic_t *enp,
        __out           uint32_t *bandwidth_mbpsp)
 {
-       uint32_t port_modes;
-       uint32_t current_mode;
        uint32_t bandwidth;
        efx_rc_t rc;
 
        /* FIXME: support new Medford2 dynamic port modes */
 
-       if ((rc = efx_mcdi_get_port_modes(enp, &port_modes,
-                                   &current_mode)) != 0) {
-               /* No port mode info available. */
-               bandwidth = 0;
-               goto out;
-       }
-
-       if ((rc = ef10_nic_get_port_mode_bandwidth(current_mode,
+       if ((rc = ef10_nic_get_port_mode_bandwidth(enp,
                                                    &bandwidth)) != 0)
                goto fail1;
 
-out:
        *bandwidth_mbpsp = bandwidth;
 
        return (0);
@@ -96,6 +86,9 @@ medford2_board_cfg(
        else
                goto fail1;
 
+       /* Checksums for TSO sends should always be correct on Medford2. */
+       encp->enc_bug61297_workaround = B_FALSE;
+
        /* Get clock frequencies (in MHz). */
        if ((rc = efx_mcdi_get_clock(enp, &sysclk, &dpcpu_clk)) != 0)
                goto fail2;