From 5ab7d2fe0f4e16092cb06e2233f9c247da65269c Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 18 Nov 2009 23:24:41 -0800
Subject: [PATCH] --- yaml --- r: 171763 b: refs/heads/master c:
 2939e275994977b6c9eb7fd082b7b0caa35b96b0 h: refs/heads/master i:   171761:
 c93a122e8a00ed8b1c3994a7a6444f8bc31e9cb9   171759:
 dbbb20e78dd821aea3d93591b5d8f0cc6f909d06 v: v3

---
 [refs]                    | 2 +-
 trunk/net/sched/em_meta.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 81a8bf6d4583..1717d720044c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3505d1a9fd65e2d3e00827857b6795d9d8983658
+refs/heads/master: 2939e275994977b6c9eb7fd082b7b0caa35b96b0
diff --git a/trunk/net/sched/em_meta.c b/trunk/net/sched/em_meta.c
index 8e8d836f00c0..24dce8b648a4 100644
--- a/trunk/net/sched/em_meta.c
+++ b/trunk/net/sched/em_meta.c
@@ -310,7 +310,8 @@ META_COLLECTOR(var_sk_bound_if)
 		struct net_device *dev;
 
 		rcu_read_lock();
-		dev = dev_get_by_index_rcu(&init_net, skb->sk->sk_bound_dev_if);
+		dev = dev_get_by_index_rcu(sock_net(skb->sk),
+					   skb->sk->sk_bound_dev_if);
 		*err = var_dev(dev, dst);
 		rcu_read_unlock();
 	}