summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2009-11-18 23:24:41 -0800
committerDavid S. Miller <davem@davemloft.net>2009-11-18 23:24:41 -0800
commit2939e275994977b6c9eb7fd082b7b0caa35b96b0 (patch)
tree25bb3e0c2b38274b24fd7f808d78f8d083d9e02a /net
parent3505d1a9fd65e2d3e00827857b6795d9d8983658 (diff)
downloadop-kernel-dev-2939e275994977b6c9eb7fd082b7b0caa35b96b0.zip
op-kernel-dev-2939e275994977b6c9eb7fd082b7b0caa35b96b0.tar.gz
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')
-rw-r--r--net/sched/em_meta.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index 8e8d836..24dce8b 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();
}
OpenPOWER on IntegriCloud