diff options
| author | Jeff Kirsher | 2006-01-13 01:51:10 +0100 |
|---|---|---|
| committer | Jeff Garzik | 2006-01-17 13:48:02 +0100 |
| commit | ff14701350eef6df9b7fc0ae118e1689e141a54c (patch) | |
| tree | 2c49417d650df54c2ce85d06fd4983df13ae1493 /drivers | |
| parent | [PATCH] e1000: Fix __pskb_pull_tail (diff) | |
| download | kernel-qcow2-linux-ff14701350eef6df9b7fc0ae118e1689e141a54c.tar.gz kernel-qcow2-linux-ff14701350eef6df9b7fc0ae118e1689e141a54c.tar.xz kernel-qcow2-linux-ff14701350eef6df9b7fc0ae118e1689e141a54c.zip | |
[PATCH] e1000: Fix VLAN support
Fixed VLAN support by switching control over to the firmware.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index dd3d3232c94e..8190eb00d54f 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -4245,8 +4245,12 @@ e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid) if((adapter->hw.mng_cookie.status & E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) && - (vid == adapter->mng_vlan_id)) + (vid == adapter->mng_vlan_id)) { + /* release control to f/w */ + e1000_release_hw_control(adapter); return; + } + /* remove VID from filter table */ index = (vid >> 5) & 0x7F; vfta = E1000_READ_REG_ARRAY(&adapter->hw, VFTA, index); |