net/core: use __vlan_hwaccel helpers

This removes assumptions about VLAN_TAG_PRESENT bit.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/dev.c b/net/core/dev.c
index 0ffcbdd55fa9ee545c807f2ed3fc178830e3075a..bf7e0a471186bad15db01b7418bce1c19941bcfc 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4889,7 +4889,7 @@ skip_classify:
                 * and set skb->priority like in vlan_do_receive()
                 * For the time being, just ignore Priority Code Point
                 */
-               skb->vlan_tci = 0;
+               __vlan_hwaccel_clear_tag(skb);
        }
 
        type = skb->protocol;
@@ -5386,7 +5386,9 @@ static struct list_head *gro_list_prepare(struct napi_struct *napi,
                }
 
                diffs = (unsigned long)p->dev ^ (unsigned long)skb->dev;
-               diffs |= p->vlan_tci ^ skb->vlan_tci;
+               diffs |= skb_vlan_tag_present(p) ^ skb_vlan_tag_present(skb);
+               if (skb_vlan_tag_present(p))
+                       diffs |= p->vlan_tci ^ skb->vlan_tci;
                diffs |= skb_metadata_dst_cmp(p, skb);
                diffs |= skb_metadata_differs(p, skb);
                if (maclen == ETH_HLEN)
@@ -5652,7 +5654,7 @@ static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb)
        __skb_pull(skb, skb_headlen(skb));
        /* restore the reserve we had after netdev_alloc_skb_ip_align() */
        skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN - skb_headroom(skb));
-       skb->vlan_tci = 0;
+       __vlan_hwaccel_clear_tag(skb);
        skb->dev = napi->dev;
        skb->skb_iif = 0;
        skb->encapsulation = 0;

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 5cb4b3440153d4bf16e82653b337e9c9bad0e34e..396fcb3baad078809840e4ab1eb3951dccd11058 100644 (file)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -5166,7 +5166,7 @@ int skb_vlan_pop(struct sk_buff *skb)
        int err;
 
        if (likely(skb_vlan_tag_present(skb))) {
-               skb->vlan_tci = 0;
+               __vlan_hwaccel_clear_tag(skb);
        } else {
                if (unlikely(!eth_type_vlan(skb->protocol)))
                        return 0;

diff --git a/net/sched/act_vlan.c b/net/sched/act_vlan.c
index ba677d54a7af9ea0c6aba1e18bb94832e756101e..93fdaf707313fdbb78ce8c13993edd2455880919 100644 (file)
--- a/net/sched/act_vlan.c
+++ b/net/sched/act_vlan.c
@@ -63,7 +63,7 @@ static int tcf_vlan_act(struct sk_buff *skb, const struct tc_action *a,
                /* extract existing tag (and guarantee no hw-accel tag) */
                if (skb_vlan_tag_present(skb)) {
                        tci = skb_vlan_tag_get(skb);
-                       skb->vlan_tci = 0;
+                       __vlan_hwaccel_clear_tag(skb);
                } else {
                        /* in-payload vlan tag, pop it */
                        err = __skb_vlan_pop(skb, &tci);