]> rtime.felk.cvut.cz Git - linux-imx.git/commit
igb: fix vlan filtering in promisc mode when not in VT mode
authorEmil Tantilov <emil.s.tantilov@intel.com>
Fri, 26 Jul 2013 12:46:36 +0000 (05:46 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 28 Jul 2013 20:17:17 +0000 (13:17 -0700)
commit7e44892c1b6bb499cb2f6d5c0f4afcc077a26074
tree2817f5b5828cbfa1b8c5fdb15d35a316e13b302a
parent1eb9ac14c34a948bf1538bfb9034e8ab29099a64
igb: fix vlan filtering in promisc mode when not in VT mode

This patch fixes a VT mode check to make sure VLAN filters are disabled when
in promisc mode and VT is not enabled.

The problem with the previous check was that:
E1000_MRQC_ENABLE_VMDQ is defined as 0x00000003

but when not in VT mode:
mrqc |= E1000_MRQC_ENABLE_RSS_4Q (0x00000002)

So the above check will trigger regardless if VT mode is being used or not.

Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/intel/igb/igb_main.c