net: sched: cls_fw: rename fw_change_attrs function

[platform/kernel/linux-rpi.git] / net / sched / cls_fw.c

diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c
index d388536..358bf34 100644 (file)
--- a/net/sched/cls_fw.c
+++ b/net/sched/cls_fw.c
@@ -190,10 +190,9 @@ static const struct nla_policy fw_policy[TCA_FW_MAX + 1] = {
        [TCA_FW_MASK]           = { .type = NLA_U32 },
 };
 
-static int
-fw_change_attrs(struct net *net, struct tcf_proto *tp, struct fw_filter *f,
-               struct nlattr **tb, struct nlattr **tca, unsigned long base,
-               bool ovr)
+static int fw_set_parms(struct net *net, struct tcf_proto *tp,
+                       struct fw_filter *f, struct nlattr **tb,
+                       struct nlattr **tca, unsigned long base, bool ovr)
 {
        struct fw_head *head = rtnl_dereference(tp->root);
        struct tcf_exts e;
@@ -282,7 +281,7 @@ static int fw_change(struct net *net, struct sk_buff *in_skb,
                        return err;
                }
 
-               err = fw_change_attrs(net, tp, fnew, tb, tca, base, ovr);
+               err = fw_set_parms(net, tp, fnew, tb, tca, base, ovr);
                if (err < 0) {
                        tcf_exts_destroy(&fnew->exts);
                        kfree(fnew);
@@ -330,7 +329,7 @@ static int fw_change(struct net *net, struct sk_buff *in_skb,
        f->id = handle;
        f->tp = tp;
 
-       err = fw_change_attrs(net, tp, f, tb, tca, base, ovr);
+       err = fw_set_parms(net, tp, f, tb, tca, base, ovr);
        if (err < 0)
                goto errout;
 
@@ -387,7 +386,7 @@ static int fw_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
 
        t->tcm_handle = f->id;
 
-       if (!f->res.classid && !tcf_exts_is_available(&f->exts))
+       if (!f->res.classid && !tcf_exts_has_actions(&f->exts))
                return skb->len;
 
        nest = nla_nest_start(skb, TCA_OPTIONS);