igb: fix recent VLAN changes that would leave VLANs disabled after reset

Browse source

This patch cleans up several issues with VLANs on igb after the recent
changes that were meant to leave the VLANs enabled/disable via the
netdev->features flags.

Specifically the Rx VLAN settings were being dropped after reset due to the
fact that they were not being restored correctly.  In addition I removed
the IRQ disable/enable since those were in place to protect the setting of
vlgrp.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by:  Aaron Brown  <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

...

This commit is contained in:

Alexander Duyck 2011-08-26 07:46:08 +00:00 • committed by Jeff Kirsher

parent 3ceb90fd48

commit 5faf030c9b

1 changed files with 4 additions and 14 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

18

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

View file