[SK_BUFF]: Introduce skb_reset_network_header(skb)

For the common, open coded 'skb->nh.raw = skb->data' operation, so that we can
later turn skb->nh.raw into a offset, reducing the size of struct sk_buff in
64bit land while possibly keeping it as a pointer on 32bit.

This one touches just the most simple case, next will handle the slightly more
"complex" cases.

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

6 files changed, 8 insertions, 8 deletions

diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index e6e196cd3b8c..8c533ceb9709 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -578,7 +578,7 @@ struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip,
                 return NULL;
 
         skb_reserve(skb, LL_RESERVED_SPACE(dev));
-        skb->nh.raw = skb->data;
+        skb_reset_network_header(skb);
         arp = (struct arphdr *) skb_put(skb,sizeof(struct arphdr) + 2*(dev->addr_len+4));
         skb->dev = dev;
         skb->protocol = htons(ETH_P_ARP);
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 88f8aae873f4..ced2c4baf174 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -474,7 +474,7 @@ out:
         dst_release(skb2->dst);
         skb2->dst = NULL;
         skb_pull(skb2, skb->data - (u8*)eiph);
-        skb2->nh.raw = skb2->data;
+        skb_reset_network_header(skb2);
 
         /* Try to guess incoming interface */
         memset(&fl, 0, sizeof(fl));
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index ddba857bd243..32f1a23a80f9 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -593,7 +593,7 @@ slow_path:
                 ip_copy_metadata(skb2, skb);
                 skb_reserve(skb2, ll_rs);
                 skb_put(skb2, len + hlen);
-                skb2->nh.raw = skb2->data;
+                skb_reset_network_header(skb2);
                 skb2->h.raw = skb2->data + hlen;
 
                 /*
@@ -722,7 +722,7 @@ static inline int ip_ufo_append_data(struct sock *sk,
                 skb_put(skb,fragheaderlen + transhdrlen);
 
                 /* initialize network header pointer */
-                skb->nh.raw = skb->data;
+                skb_reset_network_header(skb);
 
                 /* initialize protocol header pointer */
                 skb->h.raw = skb->data + fragheaderlen;
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 3ec5ce0f5498..5f886c892861 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -405,7 +405,7 @@ out:
         dst_release(skb2->dst);
         skb2->dst = NULL;
         skb_pull(skb2, skb->data - (u8*)eiph);
-        skb2->nh.raw = skb2->data;
+        skb_reset_network_header(skb2);
 
         /* Try to guess incoming interface */
         memset(&fl, 0, sizeof(fl));
@@ -487,7 +487,7 @@ static int ipip_rcv(struct sk_buff *skb)
                 secpath_reset(skb);
 
                 skb->mac.raw = skb->nh.raw;
-                skb->nh.raw = skb->data;
+                skb_reset_network_header(skb);
                 skb->protocol = htons(ETH_P_IP);
                 skb->pkt_type = PACKET_HOST;
 
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 486ab93127ce..d29861844903 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2748,7 +2748,7 @@ int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void *arg)
            through good chunk of routing engine.
          */
         skb_reset_mac_header(skb);
-        skb->nh.raw = skb->data;
+        skb_reset_network_header(skb);
 
         /* Bugfix: need to give ip_route_input enough of an IP header to not gag. */
         skb->nh.iph->protocol = IPPROTO_ICMP;
diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c
index 8e123e30cf61..ffc6005d1d55 100644
--- a/net/ipv4/xfrm4_mode_tunnel.c
+++ b/net/ipv4/xfrm4_mode_tunnel.c
@@ -129,7 +129,7 @@ static int xfrm4_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
         old_mac = skb_mac_header(skb);
         skb_set_mac_header(skb, -skb->mac_len);
         memmove(skb_mac_header(skb), old_mac, skb->mac_len);
-        skb->nh.raw = skb->data;
+        skb_reset_network_header(skb);
         err = 0;
 
 out: