aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/igb/igb_main.c
diff options
context:
space:
mode:
authorTodd Fujinaka <todd.fujinaka@intel.com>2016-01-11 12:34:50 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2016-02-24 18:29:16 -0500
commitc883de9fd787b6f49bf825f3de3601aeb78a7114 (patch)
tree5400c7e5a0ff1aa04dc20b7466eb11b14c9857c8 /drivers/net/ethernet/intel/igb/igb_main.c
parent569f3b3d4e9898ae30788fde128e3277d996710e (diff)
igb: rename igb define to be more generic
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>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb_main.c')
-rw-r--r--drivers/net/ethernet/intel/igb/igb_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 4238f3edaa3e..99acd84841e4 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)
3497 wr32(E1000_VT_CTL, vtctl); 3497 wr32(E1000_VT_CTL, vtctl);
3498 } 3498 }
3499 if (adapter->rss_queues > 1) 3499 if (adapter->rss_queues > 1)
3500 mrqc |= E1000_MRQC_ENABLE_VMDQ_RSS_2Q; 3500 mrqc |= E1000_MRQC_ENABLE_VMDQ_RSS_MQ;
3501 else 3501 else
3502 mrqc |= E1000_MRQC_ENABLE_VMDQ; 3502 mrqc |= E1000_MRQC_ENABLE_VMDQ;
3503 } else { 3503 } else {
3504 if (hw->mac.type != e1000_i211) 3504 if (hw->mac.type != e1000_i211)
3505 mrqc |= E1000_MRQC_ENABLE_RSS_4Q; 3505 mrqc |= E1000_MRQC_ENABLE_RSS_MQ;
3506 } 3506 }
3507 igb_vmm_control(adapter); 3507 igb_vmm_control(adapter);
3508 3508