commit badff6d01a8589a1c828b0bf118903ca38627f4e
author Arnaldo Carvalho de Melo <acme@redhat.com> Tue Mar 13 13:06:52 2007 -0300
committer David S. Miller <davem@sunset.davemloft.net> Wed Apr 25 22:25:15 2007 -0700
tree 89611d7058c612085c58dfb9913ee30ddf04b604
parent 0660e03f6b18f19b6bbafe7583265a51b90daf36

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

net/x25/af_x25.c

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index a198843..fc71305 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -1210,8 +1210,7 @@
 		}
 	}
 
-	skb->h.raw = skb->data;
-
+	skb_reset_transport_header(skb);
 	copied = skb->len;
 
 	if (copied > size) {

net/x25/x25_dev.c

diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c
index 94fd12f..848a6b6 100644
--- a/net/x25/x25_dev.c
+++ b/net/x25/x25_dev.c
@@ -48,7 +48,7 @@
 	if ((sk = x25_find_socket(lci, nb)) != NULL) {
 		int queued = 1;
 
-		skb->h.raw = skb->data;
+		skb_reset_transport_header(skb);
 		bh_lock_sock(sk);
 		if (!sock_owned_by_user(sk)) {
 			queued = x25_process_rx_frame(sk, skb);

net/x25/x25_in.c

diff --git a/net/x25/x25_in.c b/net/x25/x25_in.c
index c5239fc..b2bbe55 100644
--- a/net/x25/x25_in.c
+++ b/net/x25/x25_in.c
@@ -53,7 +53,7 @@
 
 		skb_queue_tail(&x25->fragment_queue, skb);
 
-		skbn->h.raw = skbn->data;
+		skb_reset_transport_header(skbn);
 
 		skbo = skb_dequeue(&x25->fragment_queue);
 		memcpy(skb_put(skbn, skbo->len), skbo->data, skbo->len);