1 files changed, 5 insertions, 9 deletions

diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index f05904e3848f..dfd18a5c3e81 100644
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -56,11 +56,6 @@ struct flow_filter {
         u32                     hashrnd;
 };
 
-static const struct tcf_ext_map flow_ext_map = {
-        .action = TCA_FLOW_ACT,
-        .police = TCA_FLOW_POLICE,
-};
-
 static inline u32 addr_fold(void *addr)
 {
         unsigned long a = (unsigned long)addr;
@@ -397,7 +392,8 @@ static int flow_change(struct net *net, struct sk_buff *in_skb,
                         return -EOPNOTSUPP;
         }
 
-        err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &e, &flow_ext_map);
+        tcf_exts_init(&e, TCA_FLOW_ACT, TCA_FLOW_POLICE);
+        err = tcf_exts_validate(net, tp, tb, tca[TCA_RATE], &e);
         if (err < 0)
                 return err;
 
@@ -455,7 +451,7 @@ static int flow_change(struct net *net, struct sk_buff *in_skb,
 
                 f->handle = handle;
                 f->mask   = ~0U;
-                tcf_exts_init(&f->exts);
+                tcf_exts_init(&f->exts, TCA_FLOW_ACT, TCA_FLOW_POLICE);
 
                 get_random_bytes(&f->hashrnd, 4);
                 f->perturb_timer.function = flow_perturbation;
@@ -609,7 +605,7 @@ static int flow_dump(struct tcf_proto *tp, unsigned long fh,
             nla_put_u32(skb, TCA_FLOW_PERTURB, f->perturb_period / HZ))
                 goto nla_put_failure;
 
-        if (tcf_exts_dump(skb, &f->exts, &flow_ext_map) < 0)
+        if (tcf_exts_dump(skb, &f->exts) < 0)
                 goto nla_put_failure;
 #ifdef CONFIG_NET_EMATCH
         if (f->ematches.hdr.nmatches &&
@@ -618,7 +614,7 @@ static int flow_dump(struct tcf_proto *tp, unsigned long fh,
 #endif
         nla_nest_end(skb, nest);
 
-        if (tcf_exts_dump_stats(skb, &f->exts, &flow_ext_map) < 0)
+        if (tcf_exts_dump_stats(skb, &f->exts) < 0)
                 goto nla_put_failure;
 
         return skb->len;