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/irda | |
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/irda')
-rw-r--r-- | net/irda/af_irda.c | 4 | ||||
-rw-r--r-- | net/irda/irlap_frame.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index 0eb7d596d470..c3cd2ba123e5 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c | |||
@@ -1363,8 +1363,8 @@ static int irda_recvmsg_dgram(struct kiocb *iocb, struct socket *sock, | |||
1363 | if (!skb) | 1363 | if (!skb) |
1364 | return err; | 1364 | return err; |
1365 | 1365 | ||
1366 | skb->h.raw = skb->data; | 1366 | skb_reset_transport_header(skb); |
1367 | copied = skb->len; | 1367 | copied = skb->len; |
1368 | 1368 | ||
1369 | if (copied > size) { | 1369 | if (copied > size) { |
1370 | IRDA_DEBUG(2, "%s(), Received truncated frame (%zd < %zd)!\n", | 1370 | IRDA_DEBUG(2, "%s(), Received truncated frame (%zd < %zd)!\n", |
diff --git a/net/irda/irlap_frame.c b/net/irda/irlap_frame.c index 7c815de4a3bf..803ac4187485 100644 --- a/net/irda/irlap_frame.c +++ b/net/irda/irlap_frame.c | |||
@@ -95,7 +95,7 @@ void irlap_queue_xmit(struct irlap_cb *self, struct sk_buff *skb) | |||
95 | skb->dev = self->netdev; | 95 | skb->dev = self->netdev; |
96 | skb_reset_mac_header(skb); | 96 | skb_reset_mac_header(skb); |
97 | skb_reset_network_header(skb); | 97 | skb_reset_network_header(skb); |
98 | skb->h.raw = skb->data; | 98 | skb_reset_transport_header(skb); |
99 | skb->protocol = htons(ETH_P_IRDA); | 99 | skb->protocol = htons(ETH_P_IRDA); |
100 | skb->priority = TC_PRIO_BESTEFFORT; | 100 | skb->priority = TC_PRIO_BESTEFFORT; |
101 | 101 | ||