X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fipv6%2Fsit.c;fp=net%2Fipv6%2Fsit.c;h=c2d3e17beae60cc1b2dcfdf4e4d46c7d57b12d05;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=836eecd7e62bfaa100a616d5aeda26ecc652ada9;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 836eecd7e..c2d3e17be 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -18,6 +18,7 @@
  * Nate Thompson <nate@thebog.net>:		6to4 support
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/capability.h>
 #include <linux/errno.h>
@@ -380,6 +381,7 @@ static int ipip6_rcv(struct sk_buff *skb)
 		secpath_reset(skb);
 		skb->mac.raw = skb->nh.raw;
 		skb->nh.raw = skb->data;
+		memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
 		IPCB(skb)->flags = 0;
 		skb->protocol = htons(ETH_P_IPV6);
 		skb->pkt_type = PACKET_HOST;
@@ -395,7 +397,7 @@ static int ipip6_rcv(struct sk_buff *skb)
 		return 0;
 	}
 
-	icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
+	icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PROT_UNREACH, 0);
 	kfree_skb(skb);
 	read_unlock(&ipip6_lock);
 out: