net/mlx5e: Correct cleanup order when deleting offloaded TC rules
authorRoi Dayan <roid@mellanox.com>
Wed, 30 Nov 2016 15:59:41 +0000 (17:59 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Dec 2016 15:47:02 +0000 (10:47 -0500)
According to the reverse unwinding principle, on delete time we should
first handle deletion of the steering rule and later handle the vlan
deletion from the eswitch.

Fixes: 8b32580df1cb ("net/mlx5e: Add TC vlan action for SRIOV offloads")
Signed-off-by: Roi Dayan <roid@mellanox.com>
Reviewed-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

index dd6d95473ade4b5e547f39911cdb709c03e6b459..4d71445d4a91acb1de2b5d48723431451d4cb124 100644 (file)
@@ -151,11 +151,11 @@ static void mlx5e_tc_del_flow(struct mlx5e_priv *priv,
 
        counter = mlx5_flow_rule_counter(rule);
 
+       mlx5_del_flow_rules(rule);
+
        if (esw && esw->mode == SRIOV_OFFLOADS)
                mlx5_eswitch_del_vlan_action(esw, attr);
 
-       mlx5_del_flow_rules(rule);
-
        mlx5_fc_destroy(priv->mdev, counter);
 
        if (!mlx5e_tc_num_filters(priv) && (priv->fs.tc.t)) {