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, 4 insertions, 4 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
index a85ca63a2c9e..56223a6aa408 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
@@ -1050,7 +1050,7 @@ qlcnic_process_rcv(struct qlcnic_adapter *adapter,
         skb->protocol = eth_type_trans(skb, netdev);
 
         if (vid != 0xffff)
-                __vlan_hwaccel_put_tag(skb, vid);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid);
 
         napi_gro_receive(&sds_ring->napi, skb);
 
@@ -1153,7 +1153,7 @@ qlcnic_process_lro(struct qlcnic_adapter *adapter,
         }
 
         if (vid != 0xffff)
-                __vlan_hwaccel_put_tag(skb, vid);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid);
         netif_receive_skb(skb);
 
         adapter->stats.lro_pkts++;
@@ -1518,7 +1518,7 @@ qlcnic_83xx_process_rcv(struct qlcnic_adapter *adapter,
         skb->protocol = eth_type_trans(skb, netdev);
 
         if (vid != 0xffff)
-                __vlan_hwaccel_put_tag(skb, vid);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid);
 
         napi_gro_receive(&sds_ring->napi, skb);
 
@@ -1615,7 +1615,7 @@ qlcnic_83xx_process_lro(struct qlcnic_adapter *adapter,
         }
 
         if (vid != 0xffff)
-                __vlan_hwaccel_put_tag(skb, vid);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid);
 
         netif_receive_skb(skb);