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>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c
index cdbc5443ae3b..8b04bfc20cfb 100644
--- a/drivers/net/ethernet/adaptec/starfire.c
+++ b/drivers/net/ethernet/adaptec/starfire.c
@@ -1498,7 +1498,7 @@ static int __netdev_rx(struct net_device *dev, int *quota)
                                 printk(KERN_DEBUG "  netdev_rx() vlanid = %d\n",
                                        vlid);
                         }
-                        __vlan_hwaccel_put_tag(skb, vlid);
+                        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlid);
                 }
 #endif /* VLAN_SUPPORT */
                 netif_receive_skb(skb);