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

diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c
index de495c57aa90..5ef6a238bdbc 100644
--- a/net/appletalk/aarp.c
+++ b/net/appletalk/aarp.c
@@ -119,7 +119,7 @@ static void __aarp_send_query(struct aarp_entry *a)
         /* Set up the buffer */
         skb_reserve(skb, dev->hard_header_len + aarp_dl->header_length);
         skb_reset_network_header(skb);
-        skb->h.raw       = skb->data;
+        skb_reset_transport_header(skb);
         skb_put(skb, sizeof(*eah));
         skb->protocol    = htons(ETH_P_ATALK);
         skb->dev         = dev;
@@ -166,7 +166,7 @@ static void aarp_send_reply(struct net_device *dev, struct atalk_addr *us,
         /* Set up the buffer */
         skb_reserve(skb, dev->hard_header_len + aarp_dl->header_length);
         skb_reset_network_header(skb);
-        skb->h.raw       = skb->data;
+        skb_reset_transport_header(skb);
         skb_put(skb, sizeof(*eah));
         skb->protocol    = htons(ETH_P_ATALK);
         skb->dev         = dev;
@@ -217,7 +217,7 @@ static void aarp_send_probe(struct net_device *dev, struct atalk_addr *us)
         /* Set up the buffer */
         skb_reserve(skb, dev->hard_header_len + aarp_dl->header_length);
         skb_reset_network_header(skb);
-        skb->h.raw       = skb->data;
+        skb_reset_transport_header(skb);
         skb_put(skb, sizeof(*eah));
         skb->protocol    = htons(ETH_P_ATALK);
         skb->dev         = dev;
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 934f25993ce8..137341b4d833 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1275,7 +1275,7 @@ static int handle_ip_over_ddp(struct sk_buff *skb)
         skb->protocol = htons(ETH_P_IP);
         skb_pull(skb, 13);
         skb->dev   = dev;
-        skb->h.raw = skb->data;
+        skb_reset_transport_header(skb);
 
         stats = dev->priv;
         stats->rx_packets++;
@@ -1522,7 +1522,7 @@ static int ltalk_rcv(struct sk_buff *skb, struct net_device *dev,
                 /* Non routable, so force a drop if we slip up later */
                 ddp->deh_len_hops = htons(skb->len + (DDP_MAXHOPS << 10));
         }
-        skb->h.raw = skb->data;
+        skb_reset_transport_header(skb);
 
         return atalk_rcv(skb, dev, pt, orig_dev);
 freeit: