aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/icmp.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-03-10 20:16:10 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:24:58 -0400
commitbbe735e4247dba32568a305553b010081c8dea99 (patch)
tree95d96619c85785a47ccee48965b68d99cf946854 /net/ipv6/icmp.c
parente7dd65dafda5737a983c04d652a69ab8da78ee3f (diff)
[SK_BUFF]: Introduce skb_network_offset()
For the quite common 'skb->nh.raw - skb->data' sequence. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/icmp.c')
-rw-r--r--net/ipv6/icmp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index a91dfbce8433..aa4a0a59ffac 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -206,7 +206,7 @@ static __inline__ int opt_unrec(struct sk_buff *skb, __u32 offset)
206{ 206{
207 u8 _optval, *op; 207 u8 _optval, *op;
208 208
209 offset += skb->nh.raw - skb->data; 209 offset += skb_network_offset(skb);
210 op = skb_header_pointer(skb, offset, sizeof(_optval), &_optval); 210 op = skb_header_pointer(skb, offset, sizeof(_optval), &_optval);
211 if (op == NULL) 211 if (op == NULL)
212 return 1; 212 return 1;
@@ -431,7 +431,7 @@ void icmpv6_send(struct sk_buff *skb, int type, int code, __u32 info,
431 tclass = 0; 431 tclass = 0;
432 432
433 msg.skb = skb; 433 msg.skb = skb;
434 msg.offset = skb->nh.raw - skb->data; 434 msg.offset = skb_network_offset(skb);
435 msg.type = type; 435 msg.type = type;
436 436
437 len = skb->len - msg.offset; 437 len = skb->len - msg.offset;