diff options
author | Mark Rustad | 2015-08-09 01:19:04 +0200 |
---|---|---|
committer | Jeff Kirsher | 2015-09-24 07:50:32 +0200 |
commit | 052a1a724338bbf4721f8b4d7de8486701fc37cb (patch) | |
tree | ace201b69417f08978b60648888061e4940e8d93 | |
parent | ixgbe: Correct error path in semaphore handling (diff) | |
download | kernel-qcow2-linux-052a1a724338bbf4721f8b4d7de8486701fc37cb.tar.gz kernel-qcow2-linux-052a1a724338bbf4721f8b4d7de8486701fc37cb.tar.xz kernel-qcow2-linux-052a1a724338bbf4721f8b4d7de8486701fc37cb.zip |
ixgbe: Correct setting of RDRXCTL register for X550* devices
Setting the X550* RDRXCTL register should fall through into X540
and 82599, not 82598.
Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 9986be5b84ca..a10728c32f65 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -3789,8 +3789,6 @@ static void ixgbe_setup_rdrxctl(struct ixgbe_adapter *adapter) u32 rdrxctl = IXGBE_READ_REG(hw, IXGBE_RDRXCTL); switch (hw->mac.type) { - case ixgbe_mac_X550: - case ixgbe_mac_X550EM_x: case ixgbe_mac_82598EB: /* * For VMDq support of different descriptor types or @@ -3804,6 +3802,8 @@ static void ixgbe_setup_rdrxctl(struct ixgbe_adapter *adapter) */ rdrxctl |= IXGBE_RDRXCTL_MVMEN; break; + case ixgbe_mac_X550: + case ixgbe_mac_X550EM_x: case ixgbe_mac_82599EB: case ixgbe_mac_X540: /* Disable RSC for ACK packets */ |