Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c883de9f authored by Todd Fujinaka's avatar Todd Fujinaka Committed by Jeff Kirsher
Browse files

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: default avatarTodd Fujinaka <todd.fujinaka@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 569f3b3d

drivers/net/ethernet/intel/igb/e1000_82575.h

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/net/ethernet/intel/igb/igb_main.c

+2 −2
Original line number Diff line number Diff line
@@ -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);