[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>

5 files changed, 11 insertions, 9 deletions

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 053147a0027e..a3e3d9e2f44b 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -828,7 +828,8 @@ static void ndisc_recv_ns(struct sk_buff *skb)
                 if (ifp->flags & (IFA_F_TENTATIVE|IFA_F_OPTIMISTIC)) {
                         if (dad) {
                                 if (dev->type == ARPHRD_IEEE802_TR) {
-                                        unsigned char *sadr = skb->mac.raw;
+                                        const unsigned char *sadr;
+                                        sadr = skb_mac_header(skb);
                                         if (((sadr[8] ^ dev->dev_addr[0]) & 0x7f) == 0 &&
                                             sadr[9] == dev->dev_addr[1] &&
                                             sadr[10] == dev->dev_addr[2] &&
diff --git a/net/ipv6/netfilter/ip6t_LOG.c b/net/ipv6/netfilter/ip6t_LOG.c
index afaa039d0b7b..fc9e51a77784 100644
--- a/net/ipv6/netfilter/ip6t_LOG.c
+++ b/net/ipv6/netfilter/ip6t_LOG.c
@@ -397,7 +397,7 @@ ip6t_log_packet(unsigned int pf,
                 printk("MAC=");
                 if (skb->dev && (len = skb->dev->hard_header_len) &&
                     skb->mac.raw != skb->nh.raw) {
-                        unsigned char *p = skb->mac.raw;
+                        const unsigned char *p = skb_mac_header(skb);
                         int i;
 
                         if (skb->dev->type == ARPHRD_SIT &&
@@ -412,7 +412,8 @@ ip6t_log_packet(unsigned int pf,
                         printk(" ");
 
                         if (skb->dev->type == ARPHRD_SIT) {
-                                struct iphdr *iph = (struct iphdr *)skb->mac.raw;
+                                const struct iphdr *iph =
+                                        (struct iphdr *)skb_mac_header(skb);
                                 printk("TUNNEL=%u.%u.%u.%u->%u.%u.%u.%u ",
                                        NIPQUAD(iph->saddr),
                                        NIPQUAD(iph->daddr));
diff --git a/net/ipv6/netfilter/ip6t_eui64.c b/net/ipv6/netfilter/ip6t_eui64.c
index 967bed71d4a8..c2676066a80f 100644
--- a/net/ipv6/netfilter/ip6t_eui64.c
+++ b/net/ipv6/netfilter/ip6t_eui64.c
@@ -32,8 +32,8 @@ match(const struct sk_buff *skb,
         unsigned char eui64[8];
         int i = 0;
 
-        if (!(skb->mac.raw >= skb->head &&
-              (skb->mac.raw + ETH_HLEN) <= skb->data) &&
+        if (!(skb_mac_header(skb) >= skb->head &&
+              (skb_mac_header(skb) + ETH_HLEN) <= skb->data) &&
             offset != 0) {
                 *hotdrop = 1;
                 return 0;
diff --git a/net/ipv6/xfrm6_mode_beet.c b/net/ipv6/xfrm6_mode_beet.c
index 53cfe1a10ccd..79364b1e965a 100644
--- a/net/ipv6/xfrm6_mode_beet.c
+++ b/net/ipv6/xfrm6_mode_beet.c
@@ -70,9 +70,9 @@ static int xfrm6_beet_input(struct xfrm_state *x, struct sk_buff *skb)
         memmove(skb->data, skb->nh.raw, size);
         skb->nh.raw = skb->data;
 
-        old_mac = skb->mac.raw;
+        old_mac = skb_mac_header(skb);
         skb_set_mac_header(skb, -skb->mac_len);
-        memmove(skb->mac.raw, old_mac, skb->mac_len);
+        memmove(skb_mac_header(skb), old_mac, skb->mac_len);
 
         ip6h = skb->nh.ipv6h;
         ip6h->payload_len = htons(skb->len - size);
diff --git a/net/ipv6/xfrm6_mode_tunnel.c b/net/ipv6/xfrm6_mode_tunnel.c
index d2c560c181a1..5bb0677d3730 100644
--- a/net/ipv6/xfrm6_mode_tunnel.c
+++ b/net/ipv6/xfrm6_mode_tunnel.c
@@ -108,9 +108,9 @@ static int xfrm6_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
                         ip6ip_ecn_decapsulate(skb);
                 skb->protocol = htons(ETH_P_IP);
         }
-        old_mac = skb->mac.raw;
+        old_mac = skb_mac_header(skb);
         skb_set_mac_header(skb, -skb->mac_len);
-        memmove(skb->mac.raw, old_mac, skb->mac_len);
+        memmove(skb_mac_header(skb), old_mac, skb->mac_len);
         skb->nh.raw = skb->data;
         err = 0;