diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-07-06 20:48:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-06 20:48:41 -0700 |
| commit | 38b221957b155ef410bdc28856a66386303fbd5a (patch) | |
| tree | 458006267c33308be8812a9def8eec7cbb23192a /drivers/net/e1000e | |
| parent | 4b5a698ef423eebc37cfacc6d3376d6dffd5bf83 (diff) | |
| download | linux-stable-38b221957b155ef410bdc28856a66386303fbd5a.tar.gz linux-stable-38b221957b155ef410bdc28856a66386303fbd5a.tar.bz2 linux-stable-38b221957b155ef410bdc28856a66386303fbd5a.zip | |
netdrv: don't truncate VLAN TCI with VLAN stripping
The vlan_hwaccel_{rx,receive_skb} functions expect the full TCI field
for priority mappings, don't truncate the upper 4 bits.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e')
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index acdd616c96f6..80592bdbe31e 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -98,8 +98,7 @@ static void e1000_receive_skb(struct e1000_adapter *adapter, if (adapter->vlgrp && (status & E1000_RXD_STAT_VP)) vlan_hwaccel_receive_skb(skb, adapter->vlgrp, - le16_to_cpu(vlan) & - E1000_RXD_SPC_VLAN_MASK); + le16_to_cpu(vlan)); else netif_receive_skb(skb); |