svn commit: r347786 - stable/12/sys/dev/mlx5/mlx5_en
Hans Petter Selasky
hselasky at FreeBSD.org
Thu May 16 16:41:22 UTC 2019
Author: hselasky
Date: Thu May 16 16:41:21 2019
New Revision: 347786
URL: https://svnweb.freebsd.org/changeset/base/347786
Log:
MFC r347321:
Undo previous steps upon returning failure in mlx5en(4).
Else flowtable resources may not be properly freed.
Sponsored by: Mellanox Technologies
Modified:
stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c
==============================================================================
--- stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c Thu May 16 16:40:47 2019 (r347785)
+++ stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_flow_table.c Thu May 16 16:41:21 2019 (r347786)
@@ -633,7 +633,11 @@ mlx5e_add_any_vid_rules(struct mlx5e_priv *priv)
if (err)
return (err);
- return (mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_STAG_VID, 0));
+ err = mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_STAG_VID, 0);
+ if (err)
+ mlx5e_del_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_ANY_CTAG_VID, 0);
+
+ return (err);
}
void
@@ -701,19 +705,22 @@ mlx5e_add_all_vlan_rules(struct mlx5e_priv *priv)
err = mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_MATCH_VID,
i);
if (err)
- return (err);
+ goto error;
}
err = mlx5e_add_vlan_rule(priv, MLX5E_VLAN_RULE_TYPE_UNTAGGED, 0);
if (err)
- return (err);
+ goto error;
if (priv->vlan.filter_disabled) {
err = mlx5e_add_any_vid_rules(priv);
if (err)
- return (err);
+ goto error;
}
return (0);
+error:
+ mlx5e_del_all_vlan_rules(priv);
+ return (err);
}
void
More information about the svn-src-all
mailing list