---

yaml --- r: 247064 b: refs/heads/master c: 301102c h: refs/heads/master v: v3
git-mirror · May 4, 2011 · e39679c · e39679c
1 parent 30738b8
commit e39679c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbb1e85f9cfd2bd9b7edfd21d167e89a4279faf0
+refs/heads/master: 301102cc832f9f3e24c5748705f152eaa7c307f6
diff --git a/trunk/net/ipv6/sit.c b/trunk/net/ipv6/sit.c
@@ -828,8 +828,8 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,
 	iph->frag_off		=	df;
 	iph->protocol		=	IPPROTO_IPV6;
 	iph->tos		=	INET_ECN_encapsulate(tos, ipv6_get_dsfield(iph6));
-	iph->daddr		=	rt->rt_dst;
-	iph->saddr		=	rt->rt_src;
+	iph->daddr		=	fl4.daddr;
+	iph->saddr		=	fl4.saddr;
 
 	if ((iph->ttl = tiph->ttl) == 0)
 		iph->ttl	=	iph6->hop_limit;