diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-11-19 08:24:41 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-19 08:24:41 +0100 |
commit | 2939e275994977b6c9eb7fd082b7b0caa35b96b0 (patch) | |
tree | 25bb3e0c2b38274b24fd7f808d78f8d083d9e02a /net/sched | |
parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne... (diff) | |
download | linux-2939e275994977b6c9eb7fd082b7b0caa35b96b0.tar.xz linux-2939e275994977b6c9eb7fd082b7b0caa35b96b0.zip |
netsched: Allow var_sk_bound_if meta to work on all namespaces
This fix can probably wait 2.6.33, or should use another patch
if needed in 2.6.32 (no get_dev_by_index_rcu() before 2.6.33)
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r-- | net/sched/em_meta.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c index 8e8d836f00c0..24dce8b648a4 100644 --- a/net/sched/em_meta.c +++ b/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(); } |