From c292c2606d96e420381d8be1bba122a0322c7ecf Mon Sep 17 00:00:00 2001
From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Fri, 2 May 2008 17:02:03 -0700
Subject: [PATCH] --- yaml --- r: 95912 b: refs/heads/master c:
 4ac2ccd01646e08d7176185c94e5b19404a25998 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 05b97e0671b7..2c52649d7c80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aaf8cdc34ddba08122f02217d9d684e2f9f5d575
+refs/heads/master: 4ac2ccd01646e08d7176185c94e5b19404a25998
diff --git a/trunk/net/ipv6/reassembly.c b/trunk/net/ipv6/reassembly.c
index 7b247e3a16fe..798cabc7535b 100644
--- a/trunk/net/ipv6/reassembly.c
+++ b/trunk/net/ipv6/reassembly.c
@@ -197,6 +197,7 @@ static void ip6_frag_expire(unsigned long data)
 {
 	struct frag_queue *fq;
 	struct net_device *dev = NULL;
+	struct net *net;
 
 	fq = container_of((struct inet_frag_queue *)data, struct frag_queue, q);
 
@@ -207,7 +208,8 @@ static void ip6_frag_expire(unsigned long data)
 
 	fq_kill(fq);
 
-	dev = dev_get_by_index(&init_net, fq->iif);
+	net = container_of(fq->q.net, struct net, ipv6.frags);
+	dev = dev_get_by_index(net, fq->iif);
 	if (!dev)
 		goto out;