[SK_BUFF]: Introduce skb_reset_transport_header(skb)

For the common, open coded 'skb->h.raw = skb->data' operation, so that we can
later turn skb->h.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 cases:

skb->h.raw = skb->data;
skb->h.raw = {skb_push|[__]skb_pull}()

The next ones 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>

2 files changed, 2 insertions, 2 deletions

diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c
index 9aa7b961b3eb..392f8bc92691 100644
--- a/net/ipx/af_ipx.c
+++ b/net/ipx/af_ipx.c
@@ -577,7 +577,7 @@ static struct sk_buff *ipxitf_adjust_skbuff(struct ipx_interface *intrfc,
         if (skb2) {
                 skb_reserve(skb2, out_offset);
                 skb_reset_network_header(skb2);
-                skb2->h.raw = skb2->data;
+                skb_reset_transport_header(skb2);
                 skb_put(skb2, skb->len);
                 memcpy(ipx_hdr(skb2), ipx_hdr(skb), skb->len);
                 memcpy(skb2->cb, skb->cb, sizeof(skb->cb));
diff --git a/net/ipx/ipx_route.c b/net/ipx/ipx_route.c
index e8277f544e72..e16c11423527 100644
--- a/net/ipx/ipx_route.c
+++ b/net/ipx/ipx_route.c
@@ -204,7 +204,7 @@ int ipxrtr_route_packet(struct sock *sk, struct sockaddr_ipx *usipx,
 
         /* Fill in IPX header */
         skb_reset_network_header(skb);
-        skb->h.raw = skb->data;
+        skb_reset_transport_header(skb);
         skb_put(skb, sizeof(struct ipxhdr));
         ipx = ipx_hdr(skb);
         ipx->ipx_pktsize = htons(len + sizeof(struct ipxhdr));