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

21 files changed, 48 insertions, 41 deletions

diff --git a/net/802/hippi.c b/net/802/hippi.c
index d87190038edb..87ffc12b6891 100644
--- a/net/802/hippi.c
+++ b/net/802/hippi.c
@@ -132,7 +132,7 @@ __be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev)
          */
         skb->dev = dev;
         skb_reset_mac_header(skb);
-        hip = (struct hippi_hdr *)skb->mac.raw;
+        hip = (struct hippi_hdr *)skb_mac_header(skb);
         skb_pull(skb, HIPPI_HLEN);
 
         /*
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 32b82705b685..934f25993ce8 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1484,7 +1484,7 @@ static int ltalk_rcv(struct sk_buff *skb, struct net_device *dev,
                      struct packet_type *pt, struct net_device *orig_dev)
 {
         /* Expand any short form frames */
-        if (skb->mac.raw[2] == 1) {
+        if (skb_mac_header(skb)[2] == 1) {
                 struct ddpehdr *ddp;
                 /* Find our address */
                 struct atalk_addr *ap = atalk_find_dev_addr(dev);
@@ -1510,8 +1510,8 @@ static int ltalk_rcv(struct sk_buff *skb, struct net_device *dev,
                  * we write the network numbers !
                  */
 
-                ddp->deh_dnode = skb->mac.raw[0];     /* From physical header */
-                ddp->deh_snode = skb->mac.raw[1];     /* From physical header */
+                ddp->deh_dnode = skb_mac_header(skb)[0];     /* From physical header */
+                ddp->deh_snode = skb_mac_header(skb)[1];     /* From physical header */
 
                 ddp->deh_dnet  = ap->s_net;     /* Network number */
                 ddp->deh_snet  = ap->s_net;
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 62605dc5a2c8..c89e4f6f9025 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1645,9 +1645,10 @@ static int ax25_recvmsg(struct kiocb *iocb, struct socket *sock,
                 struct sockaddr_ax25 *sax = (struct sockaddr_ax25 *)msg->msg_name;
                 ax25_digi digi;
                 ax25_address src;
+                const unsigned char *mac = skb_mac_header(skb);
 
-                ax25_addr_parse(skb->mac.raw+1, skb->data-skb->mac.raw-1, &src, NULL, &digi, NULL, NULL);
-
+                ax25_addr_parse(mac + 1, skb->data - mac - 1, &src, NULL,
+                                &digi, NULL, NULL);
                 sax->sax25_family = AF_AX25;
                 /* We set this correctly, even though we may not let the
                    application know the digi calls further down (because it
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index b1c2fa96c69e..97156c4abc8d 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -364,17 +364,20 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
 
         case BNEP_COMPRESSED_SRC_ONLY:
                 memcpy(__skb_put(nskb, ETH_ALEN), s->eh.h_dest, ETH_ALEN);
-                memcpy(__skb_put(nskb, ETH_ALEN), skb->mac.raw, ETH_ALEN);
+                memcpy(__skb_put(nskb, ETH_ALEN), skb_mac_header(skb), ETH_ALEN);
                 put_unaligned(s->eh.h_proto, (__be16 *) __skb_put(nskb, 2));
                 break;
 
         case BNEP_COMPRESSED_DST_ONLY:
-                memcpy(__skb_put(nskb, ETH_ALEN), skb->mac.raw, ETH_ALEN);
-                memcpy(__skb_put(nskb, ETH_ALEN + 2), s->eh.h_source, ETH_ALEN + 2);
+                memcpy(__skb_put(nskb, ETH_ALEN), skb_mac_header(skb),
+                       ETH_ALEN);
+                memcpy(__skb_put(nskb, ETH_ALEN + 2), s->eh.h_source,
+                       ETH_ALEN + 2);
                 break;
 
         case BNEP_GENERAL:
-                memcpy(__skb_put(nskb, ETH_ALEN * 2), skb->mac.raw, ETH_ALEN * 2);
+                memcpy(__skb_put(nskb, ETH_ALEN * 2), skb_mac_header(skb),
+                       ETH_ALEN * 2);
                 put_unaligned(s->eh.h_proto, (__be16 *) __skb_put(nskb, 2));
                 break;
         }
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index 5439a3c46c3e..1163c4f69899 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -753,7 +753,8 @@ static unsigned int br_nf_post_routing(unsigned int hook, struct sk_buff **pskb,
 #ifdef CONFIG_NETFILTER_DEBUG
         /* Be very paranoid. This probably won't happen anymore, but let's
          * keep the check just to be sure... */
-        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) {
                 printk(KERN_CRIT "br_netfilter: Argh!! br_nf_post_routing: "
                        "bad mac.raw pointer.\n");
                 goto print_error;
@@ -808,7 +809,7 @@ print_error:
                 if (realoutdev)
                         printk("[%s]", realoutdev->name);
         }
-        printk(" head:%p, raw:%p, data:%p\n", skb->head, skb->mac.raw,
+        printk(" head:%p, raw:%p, data:%p\n", skb->head, skb_mac_header(skb),
                skb->data);
         dump_stack();
         return NF_ACCEPT;
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;
diff --git a/net/ipv4/netfilter/ipt_LOG.c b/net/ipv4/netfilter/ipt_LOG.c
index d9c37fd94228..c697971fe317 100644
--- a/net/ipv4/netfilter/ipt_LOG.c
+++ b/net/ipv4/netfilter/ipt_LOG.c
@@ -399,9 +399,9 @@ ipt_log_packet(unsigned int pf,
                 /* MAC logging for input chain only. */
                 printk("MAC=");
                 if (skb->dev && skb->dev->hard_header_len
-                    && skb->mac.raw != (void*)skb->nh.iph) {
+                    && skb->mac.raw != skb->nh.raw) {
                         int i;
-                        unsigned char *p = skb->mac.raw;
+                        const unsigned char *p = skb_mac_header(skb);
                         for (i = 0; i < skb->dev->hard_header_len; i++,p++)
                                 printk("%02x%c", *p,
                                        i==skb->dev->hard_header_len - 1
diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
index 9718b666a380..fae2a34d23d0 100644
--- a/net/ipv4/netfilter/ipt_ULOG.c
+++ b/net/ipv4/netfilter/ipt_ULOG.c
@@ -251,9 +251,9 @@ static void ipt_ulog_packet(unsigned int hooknum,
                 *(pm->prefix) = '\0';
 
         if (in && in->hard_header_len > 0
-            && skb->mac.raw != (void *) skb->nh.iph
+            && skb->mac.raw != skb->nh.raw
             && in->hard_header_len <= ULOG_MAC_LEN) {
-                memcpy(pm->mac, skb->mac.raw, in->hard_header_len);
+                memcpy(pm->mac, skb_mac_header(skb), in->hard_header_len);
                 pm->mac_len = in->hard_header_len;
         } else
                 pm->mac_len = 0;
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 29ee7be45aa6..486ab93127ce 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1698,9 +1698,9 @@ static void ip_handle_martian_source(struct net_device *dev,
                 printk(KERN_WARNING "martian source %u.%u.%u.%u from "
                         "%u.%u.%u.%u, on dev %s\n",
                         NIPQUAD(daddr), NIPQUAD(saddr), dev->name);
-                if (dev->hard_header_len && skb->mac.raw) {
+                if (dev->hard_header_len && skb_mac_header_was_set(skb)) {
                         int i;
-                        unsigned char *p = skb->mac.raw;
+                        const unsigned char *p = skb_mac_header(skb);
                         printk(KERN_WARNING "ll header: ");
                         for (i = 0; i < dev->hard_header_len; i++, p++) {
                                 printk("%02x", *p);
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 1ec05bd673a7..f5e019cefc15 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3633,7 +3633,7 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list,
                 if (!nskb)
                         return;
 
-                skb_set_mac_header(nskb, skb->mac.raw - skb->head);
+                skb_set_mac_header(nskb, skb_mac_header(skb) - skb->head);
                 nskb->nh.raw = nskb->data + (skb->nh.raw - skb->head);
                 nskb->h.raw = nskb->data + (skb->h.raw - skb->head);
 
diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c
index f09055d3a768..8e123e30cf61 100644
--- a/net/ipv4/xfrm4_mode_tunnel.c
+++ b/net/ipv4/xfrm4_mode_tunnel.c
@@ -126,9 +126,9 @@ static int xfrm4_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
                 skb->protocol = htons(ETH_P_IPV6);
         }
 #endif
-        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;
 
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;
 
diff --git a/net/netfilter/xt_mac.c b/net/netfilter/xt_mac.c
index d430d90d7b26..1d3a1d98b885 100644
--- a/net/netfilter/xt_mac.c
+++ b/net/netfilter/xt_mac.c
@@ -37,8 +37,8 @@ match(const struct sk_buff *skb,
     const struct xt_mac_info *info = matchinfo;
 
     /* Is mac pointer valid? */
-    return (skb->mac.raw >= skb->head
-            && (skb->mac.raw + ETH_HLEN) <= skb->data
+    return (skb_mac_header(skb) >= skb->head &&
+            (skb_mac_header(skb) + ETH_HLEN) <= skb->data
             /* If so, compare... */
             && ((!compare_ether_addr(eth_hdr(skb)->h_source, info->srcaddr))
                 ^ info->invert));
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 6f8c72d2413b..73cb2d3e27d2 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -284,7 +284,7 @@ static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev,  struct
          *      Incoming packets have ll header pulled,
          *      push it back.
          *
-         *      For outgoing ones skb->data == skb->mac.raw
+         *      For outgoing ones skb->data == skb_mac_header(skb)
          *      so that this procedure is noop.
          */
 
@@ -303,7 +303,7 @@ static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev,  struct
 
         spkt = &PACKET_SKB_CB(skb)->sa.pkt;
 
-        skb_push(skb, skb->data-skb->mac.raw);
+        skb_push(skb, skb->data - skb_mac_header(skb));
 
         /*
          *      The SOCK_PACKET socket receives _all_ frames.
@@ -488,7 +488,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet
                    never delivered to user.
                  */
                 if (sk->sk_type != SOCK_DGRAM)
-                        skb_push(skb, skb->data - skb->mac.raw);
+                        skb_push(skb, skb->data - skb_mac_header(skb));
                 else if (skb->pkt_type == PACKET_OUTGOING) {
                         /* Special case: outgoing packets have ll header at head */
                         skb_pull(skb, skb->nh.raw - skb->data);
@@ -592,7 +592,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe
 
         if (dev->hard_header) {
                 if (sk->sk_type != SOCK_DGRAM)
-                        skb_push(skb, skb->data - skb->mac.raw);
+                        skb_push(skb, skb->data - skb_mac_header(skb));
                 else if (skb->pkt_type == PACKET_OUTGOING) {
                         /* Special case: outgoing packets have ll header at head */
                         skb_pull(skb, skb->nh.raw - skb->data);
diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index f71ba9db611e..03a9db364538 100644
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -99,8 +99,8 @@ static int recv_msg(struct sk_buff *buf, struct net_device *dev,
 
         if (likely(eb_ptr->bearer)) {
                if (likely(!dev->promiscuity) ||
-                   !memcmp(buf->mac.raw,dev->dev_addr,ETH_ALEN) ||
-                   !memcmp(buf->mac.raw,dev->broadcast,ETH_ALEN)) {
+                   !memcmp(skb_mac_header(buf), dev->dev_addr, ETH_ALEN) ||
+                   !memcmp(skb_mac_header(buf), dev->broadcast, ETH_ALEN)) {
                         size = msg_size((struct tipc_msg *)buf->data);
                         skb_trim(buf, size);
                         if (likely(buf->len == size)) {