aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-03-12 20:05:39 -0300
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:25:05 -0700
commit0272ffc46f81a4bbbf302ba093c737e969c5bb55 (patch)
tree0e646394caf56e5b72af194523b2752871c46411
parent0e1256ffd1ec654b35e023c66f6b262d4cba91e9 (diff)
downloadkernel_samsung_aries-0272ffc46f81a4bbbf302ba093c737e969c5bb55.zip
kernel_samsung_aries-0272ffc46f81a4bbbf302ba093c737e969c5bb55.tar.gz
kernel_samsung_aries-0272ffc46f81a4bbbf302ba093c737e969c5bb55.tar.bz2
[SK_BUFF] ipmr: Missed one conversion to skb_network_header()
We can't access skb->nh.raw directly anymore, it will become an offset. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/ipmr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 8c4de92..aba3ff0 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -564,7 +564,7 @@ static int ipmr_cache_report(struct sk_buff *pkt, vifi_t vifi, int assert)
skb_push(skb, sizeof(struct iphdr));
skb_reset_network_header(skb);
skb->h.raw = skb->data;
- msg = (struct igmpmsg *)skb->nh.raw;
+ msg = (struct igmpmsg *)skb_network_header(skb);
memcpy(msg, skb_network_header(pkt), sizeof(struct iphdr));
msg->im_msgtype = IGMPMSG_WHOLEPKT;
msg->im_mbz = 0;