]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
[SK_BUFF] ipmr: Missed one conversion to skb_network_header()
authorArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 12 Mar 2007 23:05:39 +0000 (20:05 -0300)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 26 Apr 2007 05:25:05 +0000 (22:25 -0700)
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>
net/ipv4/ipmr.c

index 8c4de92c1a99f43d8667491bc3ca3006bcac88a6..aba3ff0bec9764de4dda0ea4621c096da58ecdbf 100644 (file)
@@ -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;