diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-11-09 11:04:37 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-09 11:04:37 -0800 |
| commit | 14684b93019a2d2ece0df5acaf921924541b928d (patch) | |
| tree | 29cf04da2f22b85b6051b47b3731e91a43d4c94d /drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c | |
| parent | Merge branch 'sctp-rfc7829' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | linux-dev-14684b93019a2d2ece0df5acaf921924541b928d.tar.xz linux-dev-14684b93019a2d2ece0df5acaf921924541b928d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
One conflict in the BPF samples Makefile, some fixes in 'net' whilst
we were converting over to Makefile.target rules in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c index 90c79a133692..8560460d97fd 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c @@ -1097,6 +1097,8 @@ dr_rule_create_rule_nic(struct mlx5dr_rule *rule, if (htbl) mlx5dr_htbl_put(htbl); + kfree(hw_ste_arr); + return 0; free_ste: |