summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/alteon/acenic.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2013-04-19 06:04:30 +0400
committerDavid S. Miller <davem@davemloft.net>2013-04-19 22:46:06 +0400
commit86a9bad3ab6b6f858fd4443b48738cabbb6d094c (patch)
tree21d41b1c81e0f3e53ac4004627a8c9588099fea1 /drivers/net/ethernet/alteon/acenic.c
parent1fd9b1fc310314911f66d2f14a8e4f0ef37bf47b (diff)
downloadlinux-86a9bad3ab6b6f858fd4443b48738cabbb6d094c.tar.xz
net: vlan: add protocol argument to packet tagging functions
Add a protocol argument to the VLAN packet tagging functions. In case of HW tagging, we need that protocol available in the ndo_start_xmit functions, so it is stored in a new field in the skb. The new field fits into a hole (on 64 bit) and doesn't increase the sks's size. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/alteon/acenic.c')
-rw-r--r--drivers/net/ethernet/alteon/acenic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/alteon/acenic.c b/drivers/net/ethernet/alteon/acenic.c
index a7689d931053..b7894f8af9d1 100644
--- a/drivers/net/ethernet/alteon/acenic.c
+++ b/drivers/net/ethernet/alteon/acenic.c
@@ -2019,7 +2019,7 @@ static void ace_rx_int(struct net_device *dev, u32 rxretprd, u32 rxretcsm)
/* send it up */
if ((bd_flags & BD_FLG_VLAN_TAG))
- __vlan_hwaccel_put_tag(skb, retdesc->vlan);
+ __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), retdesc->vlan);
netif_rx(skb);
dev->stats.rx_packets++;