net: sched: move prio into cls_common

prio is not cls_flower specific, but it is meaningful for all
classifiers. Seems that only mlxsw cares about the value. Obviously,
cls offload in other drivers is broken.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c
index 021b6c0..95428b4 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c
@@ -270,7 +270,7 @@ static int mlxsw_sp_flower_parse(struct mlxsw_sp *mlxsw_sp,
                return -EOPNOTSUPP;
        }
 
-       mlxsw_sp_acl_rulei_priority(rulei, f->prio);
+       mlxsw_sp_acl_rulei_priority(rulei, f->common.prio);
 
        if (dissector_uses_key(f->dissector, FLOW_DISSECTOR_KEY_CONTROL)) {
                struct flow_dissector_key_control *key =

diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index ffaddf7..572083a 100644 (file)
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -409,6 +409,7 @@ struct tc_cls_common_offload {
        u32 handle;
        u32 chain_index;
        __be16 protocol;
+       u32 prio;
 };
 
 static inline void
@@ -418,6 +419,7 @@ tc_cls_common_offload_init(struct tc_cls_common_offload *cls_common,
        cls_common->handle = tp->q->handle;
        cls_common->chain_index = tp->chain->index;
        cls_common->protocol = tp->protocol;
+       cls_common->prio = tp->prio;
 }
 
 struct tc_cls_u32_knode {
@@ -515,7 +517,6 @@ enum tc_fl_command {
 struct tc_cls_flower_offload {
        struct tc_cls_common_offload common;
        enum tc_fl_command command;
-       u32 prio;
        unsigned long cookie;
        struct flow_dissector *dissector;
        struct fl_flow_key *mask;

diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 1fdf288..ccdf2f5 100644 (file)
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -234,7 +234,6 @@ static void fl_hw_destroy_filter(struct tcf_proto *tp, struct cls_fl_filter *f)
 
        tc_cls_common_offload_init(&offload.common, tp);
        offload.command = TC_CLSFLOWER_DESTROY;
-       offload.prio = tp->prio;
        offload.cookie = (unsigned long)f;
 
        tc->cls_flower = &offload;
@@ -266,7 +265,6 @@ static int fl_hw_replace_filter(struct tcf_proto *tp,
 
        tc_cls_common_offload_init(&offload.common, tp);
        offload.command = TC_CLSFLOWER_REPLACE;
-       offload.prio = tp->prio;
        offload.cookie = (unsigned long)f;
        offload.dissector = dissector;
        offload.mask = mask;
@@ -295,7 +293,6 @@ static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f)
 
        tc_cls_common_offload_init(&offload.common, tp);
        offload.command = TC_CLSFLOWER_STATS;
-       offload.prio = tp->prio;
        offload.cookie = (unsigned long)f;
        offload.exts = &f->exts;