diff options
| author | David S. Miller <davem@davemloft.net> | 2019-08-30 15:12:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-30 15:12:05 -0700 |
| commit | fd0f75d28da24349fdccee905cf4c32202d4d1a7 (patch) | |
| tree | a4bb61e31a1cd2a8d2bf3dff653ef474634abdfe /drivers | |
| parent | de8e1beb191912f94bcab46e72f247daaf664d15 (diff) | |
| parent | daa664a5cdd599583fceb9018c49d783bc5a0d5d (diff) | |
| download | linux-fd0f75d28da24349fdccee905cf4c32202d4d1a7.tar.gz | |
Merge branch 'Fixes-for-unlocked-cls-hardware-offload-API-refactoring'
Vlad Buslov says: ==================== Fixes for unlocked cls hardware offload API refactoring Two fixes for my "Refactor cls hardware offload API to support rtnl-independent drivers" series. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 9ff28e2d72cd..dadadf221087 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -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); |