]> www.infradead.org Git - users/jedix/linux-maple.git/commit
igb: fix recent VLAN changes that would leave VLANs disabled after reset
authorAlexander Duyck <alexander.h.duyck@intel.com>
Fri, 26 Aug 2011 07:46:08 +0000 (07:46 +0000)
committerJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 12:48:29 +0000 (20:48 +0800)
commitbd488c25424d6f94eb7434c37a3a937608ff5132
treeb7239400ac65e65d77dc3b0211570588cbbdbecd
parent9d65d05c9c61bd5dbe7e5eeba4de9fe67a6fab03
igb: fix recent VLAN changes that would leave VLANs disabled after reset

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.

(cherry picked from commit 5faf030c9b6cc48c33301b4f3341f2b5c374f6b5)
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>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/igb/igb_main.c