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>

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
index fd7d85044e4a..fa0915f3999b 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -2024,7 +2024,7 @@ rrd_ok:
                                         ((rrd->vlan_tag & 7) << 13) |
                                         ((rrd->vlan_tag & 8) << 9);
 
-                        __vlan_hwaccel_put_tag(skb, vlan_tag);
+                        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
                 }
                 netif_receive_skb(skb);
 
diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
index 6b2c08a89b7e..265ce1b752ed 100644
--- a/drivers/net/ethernet/atheros/atlx/atl2.c
+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
@@ -452,7 +452,7 @@ static void atl2_intr_rx(struct atl2_adapter *adapter)
                                         ((rxd->status.vtag&7) << 13) |
                                         ((rxd->status.vtag&8) << 9);
 
-                                __vlan_hwaccel_put_tag(skb, vlan_tag);
+                                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
                         }
                         netif_rx(skb);
                         netdev->stats.rx_bytes += rx_size;