fbdev: fix fb_compat_ioctl() deadlocks

[linux-2.6-omap-h63xx.git] / include / net / pkt_cls.h

diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index 8716eb757d514f076f33a60e550096f1ede1d0dc..aa9e282db4855ffe0733f72f6e25b3cc89b913bc 100644 (file)
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -131,14 +131,14 @@ tcf_exts_exec(struct sk_buff *skb, struct tcf_exts *exts,
 
 extern int tcf_exts_validate(struct tcf_proto *tp, struct nlattr **tb,
                             struct nlattr *rate_tlv, struct tcf_exts *exts,
-                            struct tcf_ext_map *map);
+                            const struct tcf_ext_map *map);
 extern void tcf_exts_destroy(struct tcf_proto *tp, struct tcf_exts *exts);
 extern void tcf_exts_change(struct tcf_proto *tp, struct tcf_exts *dst,
                             struct tcf_exts *src);
 extern int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts,
-                        struct tcf_ext_map *map);
+                        const struct tcf_ext_map *map);
 extern int tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts,
-                              struct tcf_ext_map *map);
+                              const struct tcf_ext_map *map);
 
 /**
  * struct tcf_pkt_info - packet information
@@ -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;
        }