summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnathan Mantey <johnathanx.mantey@intel.com>2023-11-13 08:30:29 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-11-28 16:56:33 +0000
commitddec3d04f874ce772068004e2479c96b45b1b43b (patch)
tree558fc67090b7bd500ce94a1567f3990da9324feb
parentad0b74d0f331f63b2bd0b012cb31ceaedb68e601 (diff)
downloadlinux-ddec3d04f874ce772068004e2479c96b45b1b43b.tar.gz
linux-ddec3d04f874ce772068004e2479c96b45b1b43b.tar.bz2
linux-ddec3d04f874ce772068004e2479c96b45b1b43b.zip
Revert ncsi: Propagate carrier gain/loss events to the NCSI controller
commit 9e2e7efbbbff69d8340abb56d375dd79d1f5770f upstream. This reverts commit 3780bb29311eccb7a1c9641032a112eed237f7e3. The cited commit introduced unwanted behavior. The intent for the commit was to be able to detect carrier loss/gain for just the NIC connected to the BMC. The unwanted effect is a carrier loss for auxiliary paths also causes the BMC to lose carrier. The BMC never regains carrier despite the secondary NIC regaining a link. This change, when merged, needs to be backported to stable kernels. 5.4-stable, 5.10-stable, 5.15-stable, 6.1-stable, 6.5-stable Fixes: 3780bb29311e ("ncsi: Propagate carrier gain/loss events to the NCSI controller") CC: stable@vger.kernel.org Signed-off-by: Johnathan Mantey <johnathanx.mantey@intel.com> Reviewed-by: Simon Horman <horms@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/ncsi/ncsi-aen.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/net/ncsi/ncsi-aen.c b/net/ncsi/ncsi-aen.c
index f8854bff286c..62fb1031763d 100644
--- a/net/ncsi/ncsi-aen.c
+++ b/net/ncsi/ncsi-aen.c
@@ -89,11 +89,6 @@ static int ncsi_aen_handler_lsc(struct ncsi_dev_priv *ndp,
if ((had_link == has_link) || chained)
return 0;
- if (had_link)
- netif_carrier_off(ndp->ndev.dev);
- else
- netif_carrier_on(ndp->ndev.dev);
-
if (!ndp->multi_package && !nc->package->multi_channel) {
if (had_link) {
ndp->flags |= NCSI_DEV_RESHUFFLE;