Merge tag 'scsi-sg' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux.git] / net / sched / cls_fw.c

diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c
index 4dab833f66cb64a5443865b4ee424a3b5067e750..c9496c920d6fac544e8fbbe4a40965b47b4d7aad 100644 (file)
--- a/net/sched/cls_fw.c
+++ b/net/sched/cls_fw.c
@@ -8,9 +8,6 @@
  * Karlis Peisenieks <karlis@mt.lv> : 990415 : fw_walk off by one
  * Karlis Peisenieks <karlis@mt.lv> : 990415 : fw_delete killed all the filter (and kernel).
  * Alex <alex@pilotsoft.com> : 2004xxyy: Added Action extension
- *
- * JHS: We should remove the CONFIG_NET_CLS_IND from here
- * eventually when the meta match extension is made available
  */
 
 #include <linux/module.h>
@@ -37,9 +34,7 @@ struct fw_filter {
        struct fw_filter __rcu  *next;
        u32                     id;
        struct tcf_result       res;
-#ifdef CONFIG_NET_CLS_IND
        int                     ifindex;
-#endif /* CONFIG_NET_CLS_IND */
        struct tcf_exts         exts;
        struct tcf_proto        *tp;
        struct rcu_work         rwork;
@@ -67,10 +62,8 @@ static int fw_classify(struct sk_buff *skb, const struct tcf_proto *tp,
                     f = rcu_dereference_bh(f->next)) {
                        if (f->id == id) {
                                *res = f->res;
-#ifdef CONFIG_NET_CLS_IND
                                if (!tcf_match_indev(skb, f->ifindex))
                                        continue;
-#endif /* CONFIG_NET_CLS_IND */
                                r = tcf_exts_exec(skb, &f->exts, res);
                                if (r < 0)
                                        continue;
@@ -222,7 +215,6 @@ static int fw_set_parms(struct net *net, struct tcf_proto *tp,
                tcf_bind_filter(tp, &f->res, base);
        }
 
-#ifdef CONFIG_NET_CLS_IND
        if (tb[TCA_FW_INDEV]) {
                int ret;
                ret = tcf_change_indev(net, tb[TCA_FW_INDEV], extack);
@@ -230,7 +222,6 @@ static int fw_set_parms(struct net *net, struct tcf_proto *tp,
                        return ret;
                f->ifindex = ret;
        }
-#endif /* CONFIG_NET_CLS_IND */
 
        err = -EINVAL;
        if (tb[TCA_FW_MASK]) {
@@ -276,9 +267,7 @@ static int fw_change(struct net *net, struct sk_buff *in_skb,
 
                fnew->id = f->id;
                fnew->res = f->res;
-#ifdef CONFIG_NET_CLS_IND
                fnew->ifindex = f->ifindex;
-#endif /* CONFIG_NET_CLS_IND */
                fnew->tp = f->tp;
 
                err = tcf_exts_init(&fnew->exts, net, TCA_FW_ACT,
@@ -405,14 +394,12 @@ static int fw_dump(struct net *net, struct tcf_proto *tp, void *fh,
        if (f->res.classid &&
            nla_put_u32(skb, TCA_FW_CLASSID, f->res.classid))
                goto nla_put_failure;
-#ifdef CONFIG_NET_CLS_IND
        if (f->ifindex) {
                struct net_device *dev;
                dev = __dev_get_by_index(net, f->ifindex);
                if (dev && nla_put_string(skb, TCA_FW_INDEV, dev->name))
                        goto nla_put_failure;
        }
-#endif /* CONFIG_NET_CLS_IND */
        if (head->mask != 0xFFFFFFFF &&
            nla_put_u32(skb, TCA_FW_MASK, head->mask))
                goto nla_put_failure;