xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aquantia: Do not purge addresses when setting the number of rings

Browse Source 
[ Upstream commit 2a83891130512dafb321418a8e7c9c09268d8c59 ]

IPV6 addresses are purged when setting the number of rx/tx
rings using ethtool -G. The function aq_set_ringparam
calls dev_close, which removes the addresses. As a solution,
call an internal function (aq_ndev_close).

Fixes: c1af542795 ("net: aquantia: Ethtool based ring size configuration")
Signed-off-by: Izabela Bakollari <ibakolla@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Izabela Bakollari
2022-11-23 11:10:08 +01:00
committed by Greg Kroah-Hartman
parent fa59d49a49
commit 6922948c2e
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
View File

@@ -13,6 +13,7 @@
#include "aq_ptp.h" #include "aq_ptp.h"
#include "aq_filters.h" #include "aq_filters.h"
#include "aq_macsec.h" #include "aq_macsec.h"
#include "aq_main.h"
#include <linux/ptp_clock_kernel.h> #include <linux/ptp_clock_kernel.h>
@@ -841,7 +842,7 @@ static int aq_set_ringparam(struct net_device *ndev,
if (netif_running(ndev)) { if (netif_running(ndev)) {
ndev_running = true; ndev_running = true;
dev_close(ndev); aq_ndev_close(ndev);
} }
cfg->rxds = max(ring->rx_pending, hw_caps->rxds_min); cfg->rxds = max(ring->rx_pending, hw_caps->rxds_min);
@@ -857,7 +858,7 @@ static int aq_set_ringparam(struct net_device *ndev,
goto err_exit; goto err_exit;
if (ndev_running) if (ndev_running)
err = dev_open(ndev, NULL); err = aq_ndev_open(ndev);
err_exit: err_exit:
return err; return err;

4
drivers/net/ethernet/aquantia/atlantic/aq_main.c
View File

@@ -53,7 +53,7 @@ struct net_device *aq_ndev_alloc(void)
return ndev; return ndev;
} }
static int aq_ndev_open(struct net_device *ndev) int aq_ndev_open(struct net_device *ndev)
{ {
struct aq_nic_s *aq_nic = netdev_priv(ndev); struct aq_nic_s *aq_nic = netdev_priv(ndev);
int err = 0; int err = 0;
@@ -83,7 +83,7 @@ err_exit:
return err; return err;
} }
static int aq_ndev_close(struct net_device *ndev) int aq_ndev_close(struct net_device *ndev)
{ {
struct aq_nic_s *aq_nic = netdev_priv(ndev); struct aq_nic_s *aq_nic = netdev_priv(ndev);
int err = 0; int err = 0;

2
drivers/net/ethernet/aquantia/atlantic/aq_main.h
View File

@@ -14,5 +14,7 @@
void aq_ndev_schedule_work(struct work_struct *work); void aq_ndev_schedule_work(struct work_struct *work);
struct net_device *aq_ndev_alloc(void); struct net_device *aq_ndev_alloc(void);
int aq_ndev_open(struct net_device *ndev);
int aq_ndev_close(struct net_device *ndev);
#endif /* AQ_MAIN_H */ #endif /* AQ_MAIN_H */