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(); }