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/core | |
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/core')
-rw-r--r-- | net/core/dev.c | 2 | ||||
-rw-r--r-- | net/core/netpoll.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 3af0bdc86491..99f15728d9cb 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -1773,7 +1773,7 @@ int netif_receive_skb(struct sk_buff *skb) | |||
1773 | __get_cpu_var(netdev_rx_stat).total++; | 1773 | __get_cpu_var(netdev_rx_stat).total++; |
1774 | 1774 | ||
1775 | skb_reset_network_header(skb); | 1775 | skb_reset_network_header(skb); |
1776 | skb->h.raw = skb->data; | 1776 | skb_reset_transport_header(skb); |
1777 | skb->mac_len = skb->nh.raw - skb->mac.raw; | 1777 | skb->mac_len = skb->nh.raw - skb->mac.raw; |
1778 | 1778 | ||
1779 | pt_prev = NULL; | 1779 | pt_prev = NULL; |
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 496b06244a8e..8b22723d6436 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c | |||
@@ -362,7 +362,7 @@ static void arp_reply(struct sk_buff *skb) | |||
362 | return; | 362 | return; |
363 | 363 | ||
364 | skb_reset_network_header(skb); | 364 | skb_reset_network_header(skb); |
365 | skb->h.raw = skb->data; | 365 | skb_reset_transport_header(skb); |
366 | arp = arp_hdr(skb); | 366 | arp = arp_hdr(skb); |
367 | 367 | ||
368 | if ((arp->ar_hrd != htons(ARPHRD_ETHER) && | 368 | if ((arp->ar_hrd != htons(ARPHRD_ETHER) && |