diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-16 16:19:57 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:26:18 -0400 |
commit | bff9b61ce330df04c6830d823c30c04203543f01 (patch) | |
tree | 19525bb3d690a421ebd48efa578736ea1e4ca3e2 /net/ipv4 | |
parent | 514bca322cb9220308d22691ac1e74038bfabac3 (diff) |
[SK_BUFF]: Use the helpers to get the layer header pointer
Some more cases...
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/igmp.c | 2 | ||||
-rw-r--r-- | net/ipv4/ip_output.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index b0efd279ddb4..4695ada1d9b1 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c | |||
@@ -348,7 +348,7 @@ static int igmpv3_sendpack(struct sk_buff *skb) | |||
348 | { | 348 | { |
349 | struct iphdr *pip = ip_hdr(skb); | 349 | struct iphdr *pip = ip_hdr(skb); |
350 | struct igmphdr *pig = igmp_hdr(skb); | 350 | struct igmphdr *pig = igmp_hdr(skb); |
351 | const int iplen = skb->tail - skb->nh.raw; | 351 | const int iplen = skb->tail - skb_network_header(skb); |
352 | const int igmplen = skb->tail - skb_transport_header(skb); | 352 | const int igmplen = skb->tail - skb_transport_header(skb); |
353 | 353 | ||
354 | pip->tot_len = htons(iplen); | 354 | pip->tot_len = htons(iplen); |
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 11ab100d6c6c..11a6ac756f8c 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c | |||
@@ -601,7 +601,7 @@ slow_path: | |||
601 | /* | 601 | /* |
602 | * Copy a block of the IP datagram. | 602 | * Copy a block of the IP datagram. |
603 | */ | 603 | */ |
604 | if (skb_copy_bits(skb, ptr, skb2->h.raw, len)) | 604 | if (skb_copy_bits(skb, ptr, skb_transport_header(skb2), len)) |
605 | BUG(); | 605 | BUG(); |
606 | left -= len; | 606 | left -= len; |
607 | 607 | ||