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/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index c6014916f622..ca98acabf1b4 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -1936,7 +1936,7 @@ static int rhine_rx(struct net_device *dev, int limit)
                         skb->protocol = eth_type_trans(skb, dev);
 
                         if (unlikely(desc_length & DescTag))
-                                __vlan_hwaccel_put_tag(skb, vlan_tci);
+                                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tci);
                         netif_receive_skb(skb);
 
                         u64_stats_update_begin(&rp->rx_stats.syncp);