[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, 9 insertions, 9 deletions

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;