From a7da74dd1ca51e9547d3939fa2bbc61fa798013c Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Wed, 1 Oct 2008 02:13:16 -0700
Subject: [PATCH] --- yaml --- r: 110109 b: refs/heads/master c:
 2a5b82751f73a0bf6f604ce56d34adba6da1b246 h: refs/heads/master i:   110107:
 671a8522eb00a00bab798af46e0d6bd5a6591745 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv6/tcp_ipv6.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7988f8f9c485..e940335cbb6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dd7972d1204c3851a4092cecd2207e05eb29b09
+refs/heads/master: 2a5b82751f73a0bf6f604ce56d34adba6da1b246
diff --git a/trunk/net/ipv6/tcp_ipv6.c b/trunk/net/ipv6/tcp_ipv6.c
index b585c850a89a..10e22fd48222 100644
--- a/trunk/net/ipv6/tcp_ipv6.c
+++ b/trunk/net/ipv6/tcp_ipv6.c
@@ -1050,7 +1050,7 @@ static void tcp_v6_send_ack(struct sk_buff *skb, u32 seq, u32 ack, u32 win, u32
 	struct tcphdr *th = tcp_hdr(skb), *t1;
 	struct sk_buff *buff;
 	struct flowi fl;
-	struct net *net = dev_net(skb->dev);
+	struct net *net = dev_net(skb->dst->dev);
 	struct sock *ctl_sk = net->ipv6.tcp_sk;
 	unsigned int tot_len = sizeof(struct tcphdr);
 	__be32 *topt;