e1000: fix vlan processing regression
authorJiri Pirko <jpirko@redhat.com>
Tue, 20 Mar 2012 18:10:01 +0000 (18:10 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 28 Mar 2012 01:43:55 +0000 (18:43 -0700)
commit52f5509fe8ccb607ff9b84ad618f244262336475
tree3ab3ceb5556c580715a799f5639b39d1748a9c38
parentcc3425cdc04206f3c8b9efb2c693e89aa3cd9ec7
e1000: fix vlan processing regression

This patch fixes a regression introduced by commit "e1000: do vlan
cleanup (799d531)".

Apparently some e1000 chips (not mine) are sensitive about the order of
setting vlan filter and vlan stripping/inserting functionality. So this
patch changes the order so it's the same as before vlan cleanup.

Reported-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Tested-by: Ben Greear <greearb@candelatech.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/e1000/e1000_main.c