From 9b470d6a3c8fbb9aa83563609599f9977069bbdd Mon Sep 17 00:00:00 2001 From: Shradha Gupta Date: Fri, 14 Jun 2024 00:19:08 -0700 Subject: [PATCH] [PATCH 37/44] net: mana: Use mana_cleanup_port_context() for rxq cleanup To cleanup rxqs in port context structures, instead of duplicating the code, use existing function mana_cleanup_port_context() which does the exact cleanup that's needed. Signed-off-by: Shradha Gupta Reviewed-by: Simon Horman Reviewed-by: Wei Liu Reviewed-by: Heng Qi Link: https://lore.kernel.org/r/1718349548-28697-1-git-send-email-shradhagupta@linux.microsoft.com Signed-off-by: Jakub Kicinski (cherry picked from commit e275e19c918b502aa4534e56dc2e25b5095e9005) Signed-off-by: Bastian Blank Gbp-Pq: Topic features/all/ethernet-microsoft Gbp-Pq: Name 0037-net-mana-Use-mana_cleanup_port_context-for-rxq-clean.patch --- drivers/net/ethernet/microsoft/mana/mana_en.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index e15393c1d47..bcf0a86b566 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -2370,8 +2370,7 @@ static int mana_init_port(struct net_device *ndev) return 0; reset_apc: - kfree(apc->rxqs); - apc->rxqs = NULL; + mana_cleanup_port_context(apc); return err; } @@ -2619,8 +2618,7 @@ static int mana_probe_port(struct mana_context *ac, int port_idx, return 0; reset_apc: - kfree(apc->rxqs); - apc->rxqs = NULL; + mana_cleanup_port_context(apc); free_net: *ndev_storage = NULL; netdev_err(ndev, "Failed to probe vPort %d: %d\n", port_idx, err); -- 2.30.2