Bluetooth: Fix race condition with L2CAP information request

[pandora-kernel.git] / include / net / pkt_cls.h

diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index d349c66..d1ca314 100644 (file)
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -246,7 +246,7 @@ struct tcf_ematch_ops
 };
 
 extern int tcf_em_register(struct tcf_ematch_ops *);
-extern int tcf_em_unregister(struct tcf_ematch_ops *);
+extern void tcf_em_unregister(struct tcf_ematch_ops *);
 extern int tcf_em_tree_validate(struct tcf_proto *, struct nlattr *,
                                struct tcf_ematch_tree *);
 extern void tcf_em_tree_destroy(struct tcf_proto *, struct tcf_ematch_tree *);
@@ -353,7 +353,7 @@ tcf_match_indev(struct sk_buff *skb, char *indev)
        if (indev[0]) {
                if  (!skb->iif)
                        return 0;
-               dev = __dev_get_by_index(&init_net, skb->iif);
+               dev = __dev_get_by_index(dev_net(skb->dev), skb->iif);
                if (!dev || strcmp(indev, dev->name))
                        return 0;
        }