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

3 files changed, 6 insertions, 6 deletions

diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 060d725e2942..95871a669dc4 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -913,7 +913,7 @@ static void dn_send_endnode_hello(struct net_device *dev, struct dn_ifaddr *ifa)
         pktlen = (__le16 *)skb_push(skb,2);
         *pktlen = dn_htons(skb->len - 2);
 
-        skb->nh.raw = skb->data;
+        skb_reset_network_header(skb);
 
         dn_rt_finish_output(skb, dn_rt_all_rt_mcast, msg->id);
 }
@@ -1005,7 +1005,7 @@ static void dn_send_router_hello(struct net_device *dev, struct dn_ifaddr *ifa)
         pktlen = (__le16 *)skb_push(skb, 2);
         *pktlen = dn_htons(skb->len - 2);
 
-        skb->nh.raw = skb->data;
+        skb_reset_network_header(skb);
 
         if (dn_am_i_a_router(dn, dn_db, ifa)) {
                 struct sk_buff *skb2 = skb_copy(skb, GFP_ATOMIC);
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c
index bf701cf5a386..4bf066c416e2 100644
--- a/net/decnet/dn_neigh.c
+++ b/net/decnet/dn_neigh.c
@@ -261,7 +261,7 @@ static int dn_long_output(struct sk_buff *skb)
         lp->s_class  = 0;
         lp->pt       = 0;
 
-        skb->nh.raw = skb->data;
+        skb_reset_network_header(skb);
 
         return NF_HOOK(PF_DECnet, NF_DN_POST_ROUTING, skb, NULL, neigh->dev, dn_neigh_output_packet);
 }
@@ -300,7 +300,7 @@ static int dn_short_output(struct sk_buff *skb)
         sp->srcnode    = cb->src;
         sp->forward    = cb->hops & 0x3f;
 
-        skb->nh.raw = skb->data;
+        skb_reset_network_header(skb);
 
         return NF_HOOK(PF_DECnet, NF_DN_POST_ROUTING, skb, NULL, neigh->dev, dn_neigh_output_packet);
 }
@@ -342,7 +342,7 @@ static int dn_phase3_output(struct sk_buff *skb)
         sp->srcnode  = cb->src & dn_htons(0x03ff);
         sp->forward  = cb->hops & 0x3f;
 
-        skb->nh.raw = skb->data;
+        skb_reset_network_header(skb);
 
         return NF_HOOK(PF_DECnet, NF_DN_POST_ROUTING, skb, NULL, neigh->dev, dn_neigh_output_packet);
 }
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index ef94ca56d7bd..34079b7ba1d3 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -615,7 +615,7 @@ int dn_route_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type
                 flags = *skb->data;
         }
 
-        skb->nh.raw = skb->data;
+        skb_reset_network_header(skb);
 
         /*
          * Weed out future version DECnet