[SK_BUFF]: Introduce skb_mac_header()

For the places where we need a pointer to the mac header, it is still legal to
touch skb->mac.raw directly if just adding to, subtracting from or setting it
to another layer header.

This one also converts some more cases to skb_reset_mac_header() that my
regex missed as it had no spaces before nor after '=', ugh.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 3 insertions, 3 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 2fcaf5bc4a9c..560560fe3064 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1232,7 +1232,7 @@ struct sk_buff *skb_gso_segment(struct sk_buff *skb, int features)
         }
         rcu_read_unlock();
 
-        __skb_push(skb, skb->data - skb->mac.raw);
+        __skb_push(skb, skb->data - skb_mac_header(skb));
 
         return segs;
 }
diff --git a/net/core/filter.c b/net/core/filter.c
index 8d185a089c53..1cc128d05422 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -44,7 +44,7 @@ static void *__load_pointer(struct sk_buff *skb, int k)
         if (k >= SKF_NET_OFF)
                 ptr = skb->nh.raw + k - SKF_NET_OFF;
         else if (k >= SKF_LL_OFF)
-                ptr = skb->mac.raw + k - SKF_LL_OFF;
+                ptr = skb_mac_header(skb) + k - SKF_LL_OFF;
 
         if (ptr >= skb->head && ptr < skb->tail)
                 return ptr;
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 8f6ebd0d3693..1493c95f633e 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -1878,7 +1878,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int features)
         struct sk_buff *segs = NULL;
         struct sk_buff *tail = NULL;
         unsigned int mss = skb_shinfo(skb)->gso_size;
-        unsigned int doffset = skb->data - skb->mac.raw;
+        unsigned int doffset = skb->data - skb_mac_header(skb);
         unsigned int offset = doffset;
         unsigned int headroom;
         unsigned int len;