Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Hering <ohering@suse.de>2017-10-20 12:20:33 +0200
committerOlaf Hering <ohering@suse.de>2017-10-20 12:23:29 +0200
commit8167be1a0ece5bbb73d60dedb691b9c58bb853ea (patch)
tree4725b1b2dc1f998e9444ff1a8b9b1b61b2e0d206
parent98621aae96869e74e424e31699dd56f682dc0e54 (diff)
hv_netvsc: Fix the channel limit in netvsc_set_rxfh()
-rw-r--r--patches.suse/msft-hv-1460-hv_netvsc-Fix-the-channel-limit-in-netvsc_set_rxfh.patch29
-rw-r--r--series.conf1
2 files changed, 30 insertions, 0 deletions
diff --git a/patches.suse/msft-hv-1460-hv_netvsc-Fix-the-channel-limit-in-netvsc_set_rxfh.patch b/patches.suse/msft-hv-1460-hv_netvsc-Fix-the-channel-limit-in-netvsc_set_rxfh.patch
new file mode 100644
index 0000000000..35140eeaf7
--- /dev/null
+++ b/patches.suse/msft-hv-1460-hv_netvsc-Fix-the-channel-limit-in-netvsc_set_rxfh.patch
@@ -0,0 +1,29 @@
+From: Haiyang Zhang <haiyangz@microsoft.com>
+Date: Fri, 1 Sep 2017 14:30:07 -0700
+Patch-mainline: v4.14-rc1
+Subject: hv_netvsc: Fix the channel limit in netvsc_set_rxfh()
+Git-commit: db3cd7af9d0f174475cbcc02c0e96a5408fe2dc2
+References: fate#323887
+
+The limit of setting receive indirection table value should be
+the current number of channels, not the VRSS_CHANNEL_MAX.
+
+Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Acked-by: Olaf Hering <ohering@suse.de>
+---
+ drivers/net/hyperv/netvsc_drv.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
+--- a/drivers/net/hyperv/netvsc_drv.c
++++ b/drivers/net/hyperv/netvsc_drv.c
+@@ -1407,7 +1407,7 @@ static int netvsc_set_rxfh(struct net_device *dev, const u32 *indir,
+ rndis_dev = ndev->extension;
+ if (indir) {
+ for (i = 0; i < ITAB_NUM; i++)
+- if (indir[i] >= VRSS_CHANNEL_MAX)
++ if (indir[i] >= ndev->num_chn)
+ return -EINVAL;
+
+ for (i = 0; i < ITAB_NUM; i++)
diff --git a/series.conf b/series.conf
index 8745cbee57..6c9186c16b 100644
--- a/series.conf
+++ b/series.conf
@@ -1708,6 +1708,7 @@
patches.suse/msft-hv-1457-hv_netvsc-Clean-up-an-unused-parameter-in-rndis_filt.patch
patches.suse/msft-hv-1458-hv_netvsc-Simplify-num_chn-checking-in-rndis_filter_.patch
patches.suse/msft-hv-1459-hv_netvsc-Simplify-the-limit-check-in-netvsc_set_cha.patch
+ patches.suse/msft-hv-1460-hv_netvsc-Fix-the-channel-limit-in-netvsc_set_rxfh.patch
patches.suse/suse-hv-guest-os-id.patch
patches.suse/suse-hv-kvp_on_msg.dbg.patch