aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-03-15 20:42:27 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:26:03 -0400
commitddc7b8e32b22fe8b45d306b7d99472d4b560add6 (patch)
treeb332f3e1385230d666af36fd52c45f8b7ad1a18f /net/ipv4
parent0a6114d94b6d6f82e81cb8e0d8b0d4cf50739fec (diff)
[SK_BUFF]: Some more layer header conversions
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/ipmr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 8f45c95db451..357894259f8f 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -580,7 +580,8 @@ static int ipmr_cache_report(struct sk_buff *pkt, vifi_t vifi, int assert)
580 * Copy the IP header 580 * Copy the IP header
581 */ 581 */
582 582
583 skb->nh.raw = skb_put(skb, ihl); 583 skb_set_network_header(skb, skb->tail - skb->data);
584 skb_put(skb, ihl);
584 memcpy(skb->data,pkt->data,ihl); 585 memcpy(skb->data,pkt->data,ihl);
585 ip_hdr(skb)->protocol = 0; /* Flag to the kernel this is a route add */ 586 ip_hdr(skb)->protocol = 0; /* Flag to the kernel this is a route add */
586 msg = (struct igmpmsg *)skb_network_header(skb); 587 msg = (struct igmpmsg *)skb_network_header(skb);