Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / net / sched / em_meta.c

diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index 650f09c8bd6a77b41f376f9213781547adb032c2..ceda8890ab0edae550482da852ffc72e68603770 100644 (file)
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
@@ -55,7 +55,7 @@
  *     ppp0..9.
  *
  *     NOTE: Certain meta values depend on other subsystems and are
- *           only available if that subsytem is enabled in the kernel.
+ *           only available if that subsystem is enabled in the kernel.
  */
 
 #include <linux/module.h>
@@ -291,7 +291,7 @@ META_COLLECTOR(var_sk_bound_if)
         } else  {
                struct net_device *dev;
 
-               dev = dev_get_by_index(skb->sk->sk_bound_dev_if);
+               dev = dev_get_by_index(&init_net, skb->sk->sk_bound_dev_if);
                *err = var_dev(dev, dst);
                if (dev)
                        dev_put(dev);