Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 8 insertions, 6 deletions

diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index 18d85d259104..3bcac8aa333c 100644
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
@@ -58,6 +58,7 @@
  *            only available if that subsystem is enabled in the kernel.
  */
 
+#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -303,17 +304,18 @@ META_COLLECTOR(var_sk_bound_if)
 {
         SKIP_NONLOCAL(skb);
 
-         if (skb->sk->sk_bound_dev_if == 0) {
+        if (skb->sk->sk_bound_dev_if == 0) {
                 dst->value = (unsigned long) "any";
                 dst->len = 3;
-         } else  {
+        } else {
                 struct net_device *dev;
 
-                dev = dev_get_by_index(&init_net, skb->sk->sk_bound_dev_if);
+                rcu_read_lock();
+                dev = dev_get_by_index_rcu(sock_net(skb->sk),
+                                           skb->sk->sk_bound_dev_if);
                 *err = var_dev(dev, dst);
-                if (dev)
-                        dev_put(dev);
-         }
+                rcu_read_unlock();
+        }
 }
 
 META_COLLECTOR(int_sk_refcnt)