summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Wang <wangzhiqiang.bj@bytedance.com>2020-12-23 13:55:23 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-01-12 20:18:10 +0100
commit2cdf8c2747d32c85fbaa6cf36d0971ee43a0a9df (patch)
treec506a53d12f6e065f4bfbd6abbb72900711ceab1
parent23f8bea3e9d91a2553342172ef54972c01cb7616 (diff)
downloadlinux-stable-2cdf8c2747d32c85fbaa6cf36d0971ee43a0a9df.tar.gz
linux-stable-2cdf8c2747d32c85fbaa6cf36d0971ee43a0a9df.tar.bz2
linux-stable-2cdf8c2747d32c85fbaa6cf36d0971ee43a0a9df.zip
net/ncsi: Use real net-device for response handler
[ Upstream commit 427c940558560bff2583d07fc119a21094675982 ] When aggregating ncsi interfaces and dedicated interfaces to bond interfaces, the ncsi response handler will use the wrong net device to find ncsi_dev, so that the ncsi interface will not work properly. Here, we use the original net device to fix it. Fixes: 138635cc27c9 ("net/ncsi: NCSI response packet handler") Signed-off-by: John Wang <wangzhiqiang.bj@bytedance.com> Link: https://lore.kernel.org/r/20201223055523.2069-1-wangzhiqiang.bj@bytedance.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/ncsi/ncsi-rsp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ncsi/ncsi-rsp.c b/net/ncsi/ncsi-rsp.c
index 5b1f4ec66dd9..888ccc2d4e34 100644
--- a/net/ncsi/ncsi-rsp.c
+++ b/net/ncsi/ncsi-rsp.c
@@ -1120,7 +1120,7 @@ int ncsi_rcv_rsp(struct sk_buff *skb, struct net_device *dev,
int payload, i, ret;
/* Find the NCSI device */
- nd = ncsi_find_dev(dev);
+ nd = ncsi_find_dev(orig_dev);
ndp = nd ? TO_NCSI_DEV_PRIV(nd) : NULL;
if (!ndp)
return -ENODEV;