From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Mark Rustad <mark.d.rustad@intel.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
jogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 10/18] ixgbe: Correct setting of RDRXCTL register for X550* devices
Date: Wed, 23 Sep 2015 23:59:33 -0700 [thread overview]
Message-ID: <1443077981-55791-11-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1443077981-55791-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Mark Rustad <mark.d.rustad@intel.com>
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>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ++--
1 file 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 9986be5..a10728c 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 */
--
2.4.3
next prev parent reply other threads:[~2015-09-24 6:59 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-24 6:59 [net-next 00/18][pull request] Intel Wired LAN Driver Updates 2015-09-23 Jeff Kirsher
2015-09-24 6:59 ` [net-next 01/18] ixgbe: Clear I2C destination location Jeff Kirsher
2015-09-24 6:59 ` [net-next 02/18] ixgbe: Allow reduced delays during SFP detection Jeff Kirsher
2015-09-24 6:59 ` [net-next 03/18] ixgbe: Add X550EM_x dual-speed SFP+ support Jeff Kirsher
2015-09-24 6:59 ` [net-next 04/18] ixgbe: Fix 1G and 10G link stability for X550EM_x SFP+ Jeff Kirsher
2015-09-24 6:59 ` [net-next 05/18] ixgbe: Add logic to reset CS4227 when needed Jeff Kirsher
2015-09-24 6:59 ` [net-next 06/18] ixgbe: Allow SFP+ on more than 82598 and 82599 Jeff Kirsher
2015-09-24 6:59 ` [net-next 07/18] ixgbe: Limit SFP polling rate Jeff Kirsher
2015-09-24 6:59 ` [net-next 08/18] ixgbe: Add I2C bus mux support Jeff Kirsher
2015-09-24 6:59 ` [net-next 09/18] ixgbe: Correct error path in semaphore handling Jeff Kirsher
2015-09-24 6:59 ` Jeff Kirsher [this message]
2015-09-24 6:59 ` [net-next 11/18] ixgbe: Add small packet padding support for X550 Jeff Kirsher
2015-09-24 6:59 ` [net-next 12/18] ixgbe: Update ixgbe_disable_pcie_master flow for X550* Jeff Kirsher
2015-09-24 6:59 ` [net-next 13/18] ixgbe: Add new X550EM SFP+ device ID Jeff Kirsher
2015-09-24 6:59 ` [net-next 14/18] ixgbe: Correct several flaws with with DCA setup Jeff Kirsher
2015-09-24 6:59 ` [net-next 15/18] ixgbe: Only clear adapter_stopped if ixgbe_setup_fc succeeded Jeff Kirsher
2015-09-24 6:59 ` [net-next 16/18] ixgbe: Fix FCRTH value in VM-to-VM loopback mode Jeff Kirsher
2015-09-24 6:59 ` [net-next 17/18] ixgbe: X540 thermal warning interrupt not a GPI Jeff Kirsher
2015-09-24 6:59 ` [net-next 18/18] ixgbe: Advance version to 4.2.1 Jeff Kirsher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1443077981-55791-11-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=jogreene@redhat.com \
--cc=mark.d.rustad@intel.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).