summaryrefslogtreecommitdiff
path: root/net/ipv4
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-03-16 17:19:57 -0300
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:26:18 -0700
commitbff9b61ce330df04c6830d823c30c04203543f01 (patch)
tree19525bb3d690a421ebd48efa578736ea1e4ca3e2 /net/ipv4
parent514bca322cb9220308d22691ac1e74038bfabac3 (diff)
downloadlinux-3.10-bff9b61ce330df04c6830d823c30c04203543f01.tar.gz
linux-3.10-bff9b61ce330df04c6830d823c30c04203543f01.tar.bz2
linux-3.10-bff9b61ce330df04c6830d823c30c04203543f01.zip
[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.c2
-rw-r--r--net/ipv4/ip_output.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index b0efd279ddb..4695ada1d9b 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -348,7 +348,7 @@ static int igmpv3_sendpack(struct sk_buff *skb)
{
struct iphdr *pip = ip_hdr(skb);
struct igmphdr *pig = igmp_hdr(skb);
- const int iplen = skb->tail - skb->nh.raw;
+ const int iplen = skb->tail - skb_network_header(skb);
const int igmplen = skb->tail - skb_transport_header(skb);
pip->tot_len = htons(iplen);
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 11ab100d6c6..11a6ac756f8 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -601,7 +601,7 @@ slow_path:
/*
* Copy a block of the IP datagram.
*/
- if (skb_copy_bits(skb, ptr, skb2->h.raw, len))
+ if (skb_copy_bits(skb, ptr, skb_transport_header(skb2), len))
BUG();
left -= len;