Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9e30088 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by David S. Miller
Browse files

net: flow_offload: rename tc_cls_flower_offload to flow_cls_offload 



And any other existing fields in this structure that refer to tc.
Specifically:

* tc_cls_flower_offload_flow_rule() to flow_cls_offload_flow_rule().
* TC_CLSFLOWER_* to FLOW_CLS_*.
* tc_cls_common_offload to tc_cls_common_offload.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0d4fd02e

drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c

+9 −9
Original line number Diff line number Diff line
@@ -170,10 +170,10 @@ static int bnxt_tc_parse_actions(struct bnxt *bp, 
}



static int bnxt_tc_parse_flow(struct bnxt *bp,

			      struct tc_cls_flower_offload *tc_flow_cmd,

			      struct flow_cls_offload *tc_flow_cmd,

			      struct bnxt_tc_flow *flow)

{

	struct flow_rule *rule = tc_cls_flower_offload_flow_rule(tc_flow_cmd);

	struct flow_rule *rule = flow_cls_offload_flow_rule(tc_flow_cmd);

	struct flow_dissector *dissector = rule->match.dissector;



	/* KEY_CONTROL and KEY_BASIC are needed for forming a meaningful key */
@@ -1262,7 +1262,7 @@ static void bnxt_tc_set_src_fid(struct bnxt *bp, struct bnxt_tc_flow *flow, 
 * The hash-tables are already protected by the rhashtable API.

 */

static int bnxt_tc_add_flow(struct bnxt *bp, u16 src_fid,

			    struct tc_cls_flower_offload *tc_flow_cmd)

			    struct flow_cls_offload *tc_flow_cmd)

{

	struct bnxt_tc_flow_node *new_node, *old_node;

	struct bnxt_tc_info *tc_info = bp->tc_info;
@@ -1348,7 +1348,7 @@ static int bnxt_tc_add_flow(struct bnxt *bp, u16 src_fid, 
}



static int bnxt_tc_del_flow(struct bnxt *bp,

			    struct tc_cls_flower_offload *tc_flow_cmd)

			    struct flow_cls_offload *tc_flow_cmd)

{

	struct bnxt_tc_info *tc_info = bp->tc_info;

	struct bnxt_tc_flow_node *flow_node;
@@ -1363,7 +1363,7 @@ static int bnxt_tc_del_flow(struct bnxt *bp, 
}



static int bnxt_tc_get_flow_stats(struct bnxt *bp,

				  struct tc_cls_flower_offload *tc_flow_cmd)

				  struct flow_cls_offload *tc_flow_cmd)

{

	struct bnxt_tc_flow_stats stats, *curr_stats, *prev_stats;

	struct bnxt_tc_info *tc_info = bp->tc_info;
@@ -1585,14 +1585,14 @@ void bnxt_tc_flow_stats_work(struct bnxt *bp) 
}



int bnxt_tc_setup_flower(struct bnxt *bp, u16 src_fid,

			 struct tc_cls_flower_offload *cls_flower)

			 struct flow_cls_offload *cls_flower)

{

	switch (cls_flower->command) {

	case TC_CLSFLOWER_REPLACE:

	case FLOW_CLS_REPLACE:

		return bnxt_tc_add_flow(bp, src_fid, cls_flower);

	case TC_CLSFLOWER_DESTROY:

	case FLOW_CLS_DESTROY:

		return bnxt_tc_del_flow(bp, cls_flower);

	case TC_CLSFLOWER_STATS:

	case FLOW_CLS_STATS:

		return bnxt_tc_get_flow_stats(bp, cls_flower);

	default:

		return -EOPNOTSUPP;

drivers/net/ethernet/broadcom/bnxt/bnxt_tc.h

+2 −2
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ struct bnxt_tc_flow_node { 
};



int bnxt_tc_setup_flower(struct bnxt *bp, u16 src_fid,

			 struct tc_cls_flower_offload *cls_flower);

			 struct flow_cls_offload *cls_flower);

int bnxt_init_tc(struct bnxt *bp);

void bnxt_shutdown_tc(struct bnxt *bp);

void bnxt_tc_flow_stats_work(struct bnxt *bp);
@@ -209,7 +209,7 @@ static inline bool bnxt_tc_flower_enabled(struct bnxt *bp) 
#else /* CONFIG_BNXT_FLOWER_OFFLOAD */



static inline int bnxt_tc_setup_flower(struct bnxt *bp, u16 src_fid,

				       struct tc_cls_flower_offload *cls_flower)

				       struct flow_cls_offload *cls_flower)

{

	return -EOPNOTSUPP;

}

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+4 −4
Original line number Diff line number Diff line
@@ -3135,14 +3135,14 @@ static int cxgb_set_tx_maxrate(struct net_device *dev, int index, u32 rate) 
}



static int cxgb_setup_tc_flower(struct net_device *dev,

				struct tc_cls_flower_offload *cls_flower)

				struct flow_cls_offload *cls_flower)

{

	switch (cls_flower->command) {

	case TC_CLSFLOWER_REPLACE:

	case FLOW_CLS_REPLACE:

		return cxgb4_tc_flower_replace(dev, cls_flower);

	case TC_CLSFLOWER_DESTROY:

	case FLOW_CLS_DESTROY:

		return cxgb4_tc_flower_destroy(dev, cls_flower);

	case TC_CLSFLOWER_STATS:

	case FLOW_CLS_STATS:

		return cxgb4_tc_flower_stats(dev, cls_flower);

	default:

		return -EOPNOTSUPP;

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c

+11 −11
Original line number Diff line number Diff line
@@ -80,10 +80,10 @@ static struct ch_tc_flower_entry *ch_flower_lookup(struct adapter *adap, 
}



static void cxgb4_process_flow_match(struct net_device *dev,

				     struct tc_cls_flower_offload *cls,

				     struct flow_cls_offload *cls,

				     struct ch_filter_specification *fs)

{

	struct flow_rule *rule = tc_cls_flower_offload_flow_rule(cls);

	struct flow_rule *rule = flow_cls_offload_flow_rule(cls);

	u16 addr_type = 0;



	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_CONTROL)) {
@@ -223,9 +223,9 @@ static void cxgb4_process_flow_match(struct net_device *dev, 
}



static int cxgb4_validate_flow_match(struct net_device *dev,

				     struct tc_cls_flower_offload *cls)

				     struct flow_cls_offload *cls)

{

	struct flow_rule *rule = tc_cls_flower_offload_flow_rule(cls);

	struct flow_rule *rule = flow_cls_offload_flow_rule(cls);

	struct flow_dissector *dissector = rule->match.dissector;

	u16 ethtype_mask = 0;

	u16 ethtype_key = 0;
@@ -378,10 +378,10 @@ static void process_pedit_field(struct ch_filter_specification *fs, u32 val, 
}



static void cxgb4_process_flow_actions(struct net_device *in,

				       struct tc_cls_flower_offload *cls,

				       struct flow_cls_offload *cls,

				       struct ch_filter_specification *fs)

{

	struct flow_rule *rule = tc_cls_flower_offload_flow_rule(cls);

	struct flow_rule *rule = flow_cls_offload_flow_rule(cls);

	struct flow_action_entry *act;

	int i;
@@ -544,9 +544,9 @@ static bool valid_pedit_action(struct net_device *dev, 
}



static int cxgb4_validate_flow_actions(struct net_device *dev,

				       struct tc_cls_flower_offload *cls)

				       struct flow_cls_offload *cls)

{

	struct flow_rule *rule = tc_cls_flower_offload_flow_rule(cls);

	struct flow_rule *rule = flow_cls_offload_flow_rule(cls);

	struct flow_action_entry *act;

	bool act_redir = false;

	bool act_pedit = false;
@@ -633,7 +633,7 @@ static int cxgb4_validate_flow_actions(struct net_device *dev, 
}



int cxgb4_tc_flower_replace(struct net_device *dev,

			    struct tc_cls_flower_offload *cls)

			    struct flow_cls_offload *cls)

{

	struct adapter *adap = netdev2adap(dev);

	struct ch_tc_flower_entry *ch_flower;
@@ -709,7 +709,7 @@ int cxgb4_tc_flower_replace(struct net_device *dev, 
}



int cxgb4_tc_flower_destroy(struct net_device *dev,

			    struct tc_cls_flower_offload *cls)

			    struct flow_cls_offload *cls)

{

	struct adapter *adap = netdev2adap(dev);

	struct ch_tc_flower_entry *ch_flower;
@@ -783,7 +783,7 @@ static void ch_flower_stats_cb(struct timer_list *t) 
}



int cxgb4_tc_flower_stats(struct net_device *dev,

			  struct tc_cls_flower_offload *cls)

			  struct flow_cls_offload *cls)

{

	struct adapter *adap = netdev2adap(dev);

	struct ch_tc_flower_stats *ofld_stats;

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h

+3 −3
Original line number Diff line number Diff line
@@ -109,11 +109,11 @@ struct ch_tc_pedit_fields { 
#define PEDIT_UDP_SPORT_DPORT		0x0



int cxgb4_tc_flower_replace(struct net_device *dev,

			    struct tc_cls_flower_offload *cls);

			    struct flow_cls_offload *cls);

int cxgb4_tc_flower_destroy(struct net_device *dev,

			    struct tc_cls_flower_offload *cls);

			    struct flow_cls_offload *cls);

int cxgb4_tc_flower_stats(struct net_device *dev,

			  struct tc_cls_flower_offload *cls);

			  struct flow_cls_offload *cls);



int cxgb4_init_tc_flower(struct adapter *adap);

void cxgb4_cleanup_tc_flower(struct adapter *adap);