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

diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index bd61bf5159c9..1ed75bfd8d1d 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -535,7 +535,7 @@ static struct net_device *brnf_get_logical_dev(struct sk_buff *skb, const struct
         if (brnf_pass_vlan_indev == 0 || !vlan_tx_tag_present(skb))
                 return br;
 
-        vlan = __vlan_find_dev_deep(br, htons(ETH_P_8021Q),
+        vlan = __vlan_find_dev_deep(br, skb->vlan_proto,
                                     vlan_tx_tag_get(skb) & VLAN_VID_MASK);
 
         return vlan ? vlan : br;
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index c3076e2c4294..bd58b45f5f90 100644
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -175,7 +175,7 @@ struct sk_buff *br_handle_vlan(struct net_bridge *br,
                          * mac header.
                          */
                         skb_push(skb, ETH_HLEN);
-                        skb = __vlan_put_tag(skb, skb->vlan_tci);
+                        skb = __vlan_put_tag(skb, skb->vlan_proto, skb->vlan_tci);
                         if (!skb)
                                 goto out;
                         /* put skb->data back to where it was */
@@ -217,7 +217,7 @@ bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v,
                 /* PVID is set on this port.  Any untagged ingress
                  * frame is considered to belong to this vlan.
                  */
-                __vlan_hwaccel_put_tag(skb, pvid);
+                __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), pvid);
                 return true;
         }