From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Todd Fujinaka <todd.fujinaka@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 v2 10/15] igb: rename igb define to be more generic
Date: Wed, 24 Feb 2016 18:14:57 -0800 [thread overview]
Message-ID: <1456366502-132841-11-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1456366502-132841-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Todd Fujinaka <todd.fujinaka@intel.com>
E1000_MRQC_ENABLE_RSS_4Q enables 4 and 8 queues depending on the part
so rename to be generic.
Similarly, E1000_MRQC_ENABLE_VMDQ_RSS_2Q has no numeric meaning so
rename to be more generic.
Signed-off-by: Todd Fujinaka <todd.fujinaka@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/igb/e1000_82575.h | 4 ++--
drivers/net/ethernet/intel/igb/igb_main.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.h b/drivers/net/ethernet/intel/igb/e1000_82575.h
index 2154aea..de8805a 100644
--- a/drivers/net/ethernet/intel/igb/e1000_82575.h
+++ b/drivers/net/ethernet/intel/igb/e1000_82575.h
@@ -56,10 +56,10 @@ s32 igb_write_i2c_byte(struct e1000_hw *hw, u8 byte_offset, u8 dev_addr,
#define E1000_SRRCTL_TIMESTAMP 0x40000000
-#define E1000_MRQC_ENABLE_RSS_4Q 0x00000002
+#define E1000_MRQC_ENABLE_RSS_MQ 0x00000002
#define E1000_MRQC_ENABLE_VMDQ 0x00000003
#define E1000_MRQC_RSS_FIELD_IPV4_UDP 0x00400000
-#define E1000_MRQC_ENABLE_VMDQ_RSS_2Q 0x00000005
+#define E1000_MRQC_ENABLE_VMDQ_RSS_MQ 0x00000005
#define E1000_MRQC_RSS_FIELD_IPV6_UDP 0x00800000
#define E1000_MRQC_RSS_FIELD_IPV6_UDP_EX 0x01000000
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 4238f3e..99acd84 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -3497,12 +3497,12 @@ static void igb_setup_mrqc(struct igb_adapter *adapter)
wr32(E1000_VT_CTL, vtctl);
}
if (adapter->rss_queues > 1)
- mrqc |= E1000_MRQC_ENABLE_VMDQ_RSS_2Q;
+ mrqc |= E1000_MRQC_ENABLE_VMDQ_RSS_MQ;
else
mrqc |= E1000_MRQC_ENABLE_VMDQ;
} else {
if (hw->mac.type != e1000_i211)
- mrqc |= E1000_MRQC_ENABLE_RSS_4Q;
+ mrqc |= E1000_MRQC_ENABLE_RSS_MQ;
}
igb_vmm_control(adapter);
--
2.5.0
next prev parent reply other threads:[~2016-02-25 2:26 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-25 2:14 [net-next v2 00/15][pull request] 1GbE Intel Wired LAN Driver Updates 2016-02-24 Jeff Kirsher
2016-02-25 2:14 ` [net-next v2 01/15] e1000e: Increase ULP timer Jeff Kirsher
2016-02-25 2:14 ` [net-next v2 02/15] e1000e: Increase PHY PLL clock gate timing Jeff Kirsher
2016-02-25 2:14 ` [net-next v2 03/15] e1000e: Set HW FIFO minimum pointer gap for non-gig speeds Jeff Kirsher
2016-02-25 2:14 ` [net-next v2 04/15] e1000e: Clear ULP configuration register on ULP exit Jeff Kirsher
2016-02-25 2:14 ` [net-next v2 05/15] e1000e: Initial support for KabeLake Jeff Kirsher
2016-02-25 2:14 ` [net-next v2 06/15] igb: When GbE link up, wait for Remote receiver status condition Jeff Kirsher
2016-02-25 2:14 ` [net-next v2 07/15] igb: constify e1000_phy_operations structure Jeff Kirsher
2016-02-25 2:14 ` [net-next v2 08/15] igb: enable WoL for OEM devices regardless of EEPROM setting Jeff Kirsher
2016-02-25 2:14 ` [net-next v2 09/15] igb: add conditions for I210 to generate periodic clock output Jeff Kirsher
2016-02-25 2:14 ` Jeff Kirsher [this message]
2016-02-25 2:14 ` [net-next v2 11/15] igb: Add support for generic Tx checksums Jeff Kirsher
2016-02-25 2:14 ` [net-next v2 12/15] igbvf: " Jeff Kirsher
2016-02-25 2:15 ` [net-next v2 13/15] igbvf: remove "link is Up" message when registering mcast address Jeff Kirsher
2016-02-25 2:15 ` [net-next v2 14/15] igb: Fix VLAN tag stripping on Intel i350 Jeff Kirsher
2016-02-25 2:15 ` [net-next v2 15/15] igb: call ndo_stop() instead of dev_close() when running offline selftest Jeff Kirsher
2016-02-25 7:45 ` [net-next v2 00/15][pull request] 1GbE Intel Wired LAN Driver Updates 2016-02-24 Or Gerlitz
2016-02-25 21:59 ` Jeff Kirsher
2016-02-26 19:57 ` David Miller
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=1456366502-132841-11-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=jogreene@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sassmann@redhat.com \
--cc=todd.fujinaka@intel.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).