diff options
author | Patrick McHardy <kaber@trash.net> | 2008-07-06 23:48:41 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-06 23:48:41 -0400 |
commit | 38b221957b155ef410bdc28856a66386303fbd5a (patch) | |
tree | 458006267c33308be8812a9def8eec7cbb23192a /drivers/net/e1000e | |
parent | 4b5a698ef423eebc37cfacc6d3376d6dffd5bf83 (diff) |
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, | |||
98 | 98 | ||
99 | if (adapter->vlgrp && (status & E1000_RXD_STAT_VP)) | 99 | if (adapter->vlgrp && (status & E1000_RXD_STAT_VP)) |
100 | vlan_hwaccel_receive_skb(skb, adapter->vlgrp, | 100 | vlan_hwaccel_receive_skb(skb, adapter->vlgrp, |
101 | le16_to_cpu(vlan) & | 101 | le16_to_cpu(vlan)); |
102 | E1000_RXD_SPC_VLAN_MASK); | ||
103 | else | 102 | else |
104 | netif_receive_skb(skb); | 103 | netif_receive_skb(skb); |
105 | 104 | ||