aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/igb
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-07-06 23:48:41 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-06 23:48:41 -0400
commit38b221957b155ef410bdc28856a66386303fbd5a (patch)
tree458006267c33308be8812a9def8eec7cbb23192a /drivers/net/igb
parent4b5a698ef423eebc37cfacc6d3376d6dffd5bf83 (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/igb')
-rw-r--r--drivers/net/igb/igb_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 7bc6fae182a7..afd4ce3f7b53 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -3391,8 +3391,7 @@ static void igb_receive_skb(struct igb_adapter *adapter, u8 status, __le16 vlan,
3391{ 3391{
3392 if (adapter->vlgrp && (status & E1000_RXD_STAT_VP)) 3392 if (adapter->vlgrp && (status & E1000_RXD_STAT_VP))
3393 vlan_hwaccel_receive_skb(skb, adapter->vlgrp, 3393 vlan_hwaccel_receive_skb(skb, adapter->vlgrp,
3394 le16_to_cpu(vlan) & 3394 le16_to_cpu(vlan));
3395 E1000_RXD_SPC_VLAN_MASK);
3396 else 3395 else
3397 netif_receive_skb(skb); 3396 netif_receive_skb(skb);
3398} 3397}