---

yaml --- r: 171763 b: refs/heads/master c: 2939e27 h: refs/heads/master i: 171761: c93a122 171759: dbbb20e v: v3
git-mirror · Nov 19, 2009 · 5ab7d2f · 5ab7d2f
1 parent c5f9cf6
commit 5ab7d2f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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();
 	}