Merge branch 'Fixes-for-unlocked-cls-hardware-offload-API-refactoring' (fd0f75d2) · Commits · 戴 / test

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -3497,16 +3497,18 @@ static int mlx5e_setup_tc(struct net_device *dev, enum tc_setup_type type,
		void *type_data)
		{
		struct mlx5e_priv *priv = netdev_priv(dev);
		struct flow_block_offload *f = type_data;

		switch (type) {
		#ifdef CONFIG_MLX5_ESWITCH
		case TC_SETUP_BLOCK:
		case TC_SETUP_BLOCK: {
		struct flow_block_offload *f = type_data;

		f->unlocked_driver_cb = true;
		return flow_block_cb_setup_simple(type_data,
		&mlx5e_block_cb_list,
		mlx5e_setup_tc_block_cb,
		priv, priv, true);
		}
		#endif
		case TC_SETUP_QDISC_MQPRIO:
		return mlx5e_setup_tc_mqprio(priv, type_data);

+2 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,7 @@ static int mall_replace_hw_filter(struct tcf_proto *tp,

		err = tc_setup_cb_add(block, tp, TC_SETUP_CLSMATCHALL, &cls_mall,
		skip_sw, &head->flags, &head->in_hw_count, true);
		tc_cleanup_flow_action(&cls_mall.rule->action);
		kfree(cls_mall.rule);

		if (err) {
		@@ -313,6 +314,7 @@ static int mall_reoffload(struct tcf_proto tp, bool add, flow_setup_cb_t cb,
		err = tc_setup_cb_reoffload(block, tp, add, cb, TC_SETUP_CLSMATCHALL,
		&cls_mall, cb_priv, &head->flags,
		&head->in_hw_count);
		tc_cleanup_flow_action(&cls_mall.rule->action);
		kfree(cls_mall.rule);

		if (err)