From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Mon, 12 Mar 2007 23:05:39 +0000 (-0300)
Subject: [SK_BUFF] ipmr: Missed one conversion to skb_network_header()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0272ffc46f81a4bbbf302ba093c737e969c5bb55;p=linux-beck.git

[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>
---

diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 8c4de92c1a99..aba3ff0bec97 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;