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/ax25/ax25_in.c | |
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/ax25/ax25_in.c')
-rw-r--r-- | net/ax25/ax25_in.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c index 3b2aac670266..724ad5ce75d4 100644 --- a/net/ax25/ax25_in.c +++ b/net/ax25/ax25_in.c | |||
@@ -62,7 +62,7 @@ static int ax25_rx_fragment(ax25_cb *ax25, struct sk_buff *skb) | |||
62 | 62 | ||
63 | skbn->dev = ax25->ax25_dev->dev; | 63 | skbn->dev = ax25->ax25_dev->dev; |
64 | skb_reset_network_header(skbn); | 64 | skb_reset_network_header(skbn); |
65 | skbn->h.raw = skbn->data; | 65 | skb_reset_transport_header(skbn); |
66 | 66 | ||
67 | /* Copy data from the fragments */ | 67 | /* Copy data from the fragments */ |
68 | while ((skbo = skb_dequeue(&ax25->frag_queue)) != NULL) { | 68 | while ((skbo = skb_dequeue(&ax25->frag_queue)) != NULL) { |
@@ -196,7 +196,7 @@ static int ax25_rcv(struct sk_buff *skb, struct net_device *dev, | |||
196 | * Process the AX.25/LAPB frame. | 196 | * Process the AX.25/LAPB frame. |
197 | */ | 197 | */ |
198 | 198 | ||
199 | skb->h.raw = skb->data; | 199 | skb_reset_transport_header(skb); |
200 | 200 | ||
201 | if ((ax25_dev = ax25_dev_ax25dev(dev)) == NULL) { | 201 | if ((ax25_dev = ax25_dev_ax25dev(dev)) == NULL) { |
202 | kfree_skb(skb); | 202 | kfree_skb(skb); |
@@ -246,7 +246,7 @@ static int ax25_rcv(struct sk_buff *skb, struct net_device *dev, | |||
246 | switch (skb->data[1]) { | 246 | switch (skb->data[1]) { |
247 | case AX25_P_IP: | 247 | case AX25_P_IP: |
248 | skb_pull(skb,2); /* drop PID/CTRL */ | 248 | skb_pull(skb,2); /* drop PID/CTRL */ |
249 | skb->h.raw = skb->data; | 249 | skb_reset_transport_header(skb); |
250 | skb_reset_network_header(skb); | 250 | skb_reset_network_header(skb); |
251 | skb->dev = dev; | 251 | skb->dev = dev; |
252 | skb->pkt_type = PACKET_HOST; | 252 | skb->pkt_type = PACKET_HOST; |
@@ -256,7 +256,7 @@ static int ax25_rcv(struct sk_buff *skb, struct net_device *dev, | |||
256 | 256 | ||
257 | case AX25_P_ARP: | 257 | case AX25_P_ARP: |
258 | skb_pull(skb,2); | 258 | skb_pull(skb,2); |
259 | skb->h.raw = skb->data; | 259 | skb_reset_transport_header(skb); |
260 | skb_reset_network_header(skb); | 260 | skb_reset_network_header(skb); |
261 | skb->dev = dev; | 261 | skb->dev = dev; |
262 | skb->pkt_type = PACKET_HOST; | 262 | skb->pkt_type = PACKET_HOST; |