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/starfire.c | |
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/starfire.c')
-rw-r--r-- | drivers/net/starfire.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c index 7b7b1717b0d1..2038f38dc04b 100644 --- a/drivers/net/starfire.c +++ b/drivers/net/starfire.c | |||
@@ -1510,7 +1510,7 @@ static int __netdev_rx(struct net_device *dev, int *quota) | |||
1510 | if (debug > 4) | 1510 | if (debug > 4) |
1511 | printk(KERN_DEBUG " netdev_rx() vlanid = %d\n", le16_to_cpu(desc->vlanid)); | 1511 | printk(KERN_DEBUG " netdev_rx() vlanid = %d\n", le16_to_cpu(desc->vlanid)); |
1512 | /* vlan_netdev_receive_skb() expects a packet with the VLAN tag stripped out */ | 1512 | /* vlan_netdev_receive_skb() expects a packet with the VLAN tag stripped out */ |
1513 | vlan_netdev_receive_skb(skb, np->vlgrp, le16_to_cpu(desc->vlanid) & VLAN_VID_MASK); | 1513 | vlan_netdev_receive_skb(skb, np->vlgrp, le16_to_cpu(desc->vlanid)); |
1514 | } else | 1514 | } else |
1515 | #endif /* VLAN_SUPPORT */ | 1515 | #endif /* VLAN_SUPPORT */ |
1516 | netdev_receive_skb(skb); | 1516 | netdev_receive_skb(skb); |