diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-13 12:06:52 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:25:15 -0400 |
commit | badff6d01a8589a1c828b0bf118903ca38627f4e (patch) | |
tree | 89611d7058c612085c58dfb9913ee30ddf04b604 /net/rose | |
parent | 0660e03f6b18f19b6bbafe7583265a51b90daf36 (diff) |
[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>
Diffstat (limited to 'net/rose')
-rw-r--r-- | net/rose/af_rose.c | 2 | ||||
-rw-r--r-- | net/rose/rose_loopback.c | 2 | ||||
-rw-r--r-- | net/rose/rose_route.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index f64be9369ef7..6d8684a11ac6 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c | |||
@@ -1234,7 +1234,7 @@ static int rose_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
1234 | *asmptr = qbit; | 1234 | *asmptr = qbit; |
1235 | } | 1235 | } |
1236 | 1236 | ||
1237 | skb->h.raw = skb->data; | 1237 | skb_reset_transport_header(skb); |
1238 | copied = skb->len; | 1238 | copied = skb->len; |
1239 | 1239 | ||
1240 | if (copied > size) { | 1240 | if (copied > size) { |
diff --git a/net/rose/rose_loopback.c b/net/rose/rose_loopback.c index 3e41bd93ab9f..cd01642f0491 100644 --- a/net/rose/rose_loopback.c +++ b/net/rose/rose_loopback.c | |||
@@ -77,7 +77,7 @@ static void rose_loopback_timer(unsigned long param) | |||
77 | dest = (rose_address *)(skb->data + 4); | 77 | dest = (rose_address *)(skb->data + 4); |
78 | lci_o = 0xFFF - lci_i; | 78 | lci_o = 0xFFF - lci_i; |
79 | 79 | ||
80 | skb->h.raw = skb->data; | 80 | skb_reset_transport_header(skb); |
81 | 81 | ||
82 | sk = rose_find_socket(lci_o, &rose_loopback_neigh); | 82 | sk = rose_find_socket(lci_o, &rose_loopback_neigh); |
83 | if (sk) { | 83 | if (sk) { |
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c index a1233e1b1ab6..1f9aefd95a99 100644 --- a/net/rose/rose_route.c +++ b/net/rose/rose_route.c | |||
@@ -906,7 +906,7 @@ int rose_route_frame(struct sk_buff *skb, ax25_cb *ax25) | |||
906 | } | 906 | } |
907 | } | 907 | } |
908 | else { | 908 | else { |
909 | skb->h.raw = skb->data; | 909 | skb_reset_transport_header(skb); |
910 | res = rose_process_rx_frame(sk, skb); | 910 | res = rose_process_rx_frame(sk, skb); |
911 | goto out; | 911 | goto out; |
912 | } | 912 | } |