net: sched: cls_flower: move key/mask dumping into a separate function

Push key/mask dumping from fl_dump() into a separate function
fl_dump_key(), that will be reused for template dumping.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 38d74803e2df4f32a1cc3593c5fb0ec8ba1395a9..ab10a7c883592dee8840e9a0ca384df0359a9bee 100644 (file)
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -1296,29 +1296,9 @@ static int fl_dump_key_flags(struct sk_buff *skb, u32 flags_key, u32 flags_mask)
        return nla_put(skb, TCA_FLOWER_KEY_FLAGS_MASK, 4, &_mask);
 }
 
-static int fl_dump(struct net *net, struct tcf_proto *tp, void *fh,
-                  struct sk_buff *skb, struct tcmsg *t)
+static int fl_dump_key(struct sk_buff *skb, struct net *net,
+                      struct fl_flow_key *key, struct fl_flow_key *mask)
 {
-       struct cls_fl_filter *f = fh;
-       struct nlattr *nest;
-       struct fl_flow_key *key, *mask;
-
-       if (!f)
-               return skb->len;
-
-       t->tcm_handle = f->handle;
-
-       nest = nla_nest_start(skb, TCA_OPTIONS);
-       if (!nest)
-               goto nla_put_failure;
-
-       if (f->res.classid &&
-           nla_put_u32(skb, TCA_FLOWER_CLASSID, f->res.classid))
-               goto nla_put_failure;
-
-       key = &f->key;
-       mask = &f->mask->key;
-
        if (mask->indev_ifindex) {
                struct net_device *dev;
 
@@ -1327,9 +1307,6 @@ static int fl_dump(struct net *net, struct tcf_proto *tp, void *fh,
                        goto nla_put_failure;
        }
 
-       if (!tc_skip_hw(f->flags))
-               fl_hw_update_stats(tp, f);
-
        if (fl_dump_key_val(skb, key->eth.dst, TCA_FLOWER_KEY_ETH_DST,
                            mask->eth.dst, TCA_FLOWER_KEY_ETH_DST_MASK,
                            sizeof(key->eth.dst)) ||
@@ -1505,6 +1482,41 @@ static int fl_dump(struct net *net, struct tcf_proto *tp, void *fh,
        if (fl_dump_key_flags(skb, key->control.flags, mask->control.flags))
                goto nla_put_failure;
 
+       return 0;
+
+nla_put_failure:
+       return -EMSGSIZE;
+}
+
+static int fl_dump(struct net *net, struct tcf_proto *tp, void *fh,
+                  struct sk_buff *skb, struct tcmsg *t)
+{
+       struct cls_fl_filter *f = fh;
+       struct nlattr *nest;
+       struct fl_flow_key *key, *mask;
+
+       if (!f)
+               return skb->len;
+
+       t->tcm_handle = f->handle;
+
+       nest = nla_nest_start(skb, TCA_OPTIONS);
+       if (!nest)
+               goto nla_put_failure;
+
+       if (f->res.classid &&
+           nla_put_u32(skb, TCA_FLOWER_CLASSID, f->res.classid))
+               goto nla_put_failure;
+
+       key = &f->key;
+       mask = &f->mask->key;
+
+       if (fl_dump_key(skb, net, key, mask))
+               goto nla_put_failure;
+
+       if (!tc_skip_hw(f->flags))
+               fl_hw_update_stats(tp, f);
+
        if (f->flags && nla_put_u32(skb, TCA_FLOWER_FLAGS, f->flags))
                goto nla_put_failure;