diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-10 23:50:43 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:24:59 -0400 |
commit | d56f90a7c96da5187f0cdf07ee7434fe6aa78bbc (patch) | |
tree | 3b9073cecfbb3b6a1e25ab2b5dd2a22a43aef238 /net/decnet/dn_route.c | |
parent | bbe735e4247dba32568a305553b010081c8dea99 (diff) |
[SK_BUFF]: Introduce skb_network_header()
For the places where we need a pointer to the network header, it is still legal
to touch skb->nh.raw directly if just adding to, subtracting from or setting it
to another layer header.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/decnet/dn_route.c')
-rw-r--r-- | net/decnet/dn_route.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 34079b7ba1d3..32a7db36c9e5 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c | |||
@@ -386,7 +386,7 @@ static int dn_return_short(struct sk_buff *skb) | |||
386 | __le16 tmp; | 386 | __le16 tmp; |
387 | 387 | ||
388 | /* Add back headers */ | 388 | /* Add back headers */ |
389 | skb_push(skb, skb->data - skb->nh.raw); | 389 | skb_push(skb, skb->data - skb_network_header(skb)); |
390 | 390 | ||
391 | if ((skb = skb_unshare(skb, GFP_ATOMIC)) == NULL) | 391 | if ((skb = skb_unshare(skb, GFP_ATOMIC)) == NULL) |
392 | return NET_RX_DROP; | 392 | return NET_RX_DROP; |
@@ -425,7 +425,7 @@ static int dn_return_long(struct sk_buff *skb) | |||
425 | unsigned char tmp[ETH_ALEN]; | 425 | unsigned char tmp[ETH_ALEN]; |
426 | 426 | ||
427 | /* Add back all headers */ | 427 | /* Add back all headers */ |
428 | skb_push(skb, skb->data - skb->nh.raw); | 428 | skb_push(skb, skb->data - skb_network_header(skb)); |
429 | 429 | ||
430 | if ((skb = skb_unshare(skb, GFP_ATOMIC)) == NULL) | 430 | if ((skb = skb_unshare(skb, GFP_ATOMIC)) == NULL) |
431 | return NET_RX_DROP; | 431 | return NET_RX_DROP; |