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
commitac370302bd1f70929d73a3feb452b368e889693e (patch)
tree76e9cd9a78afacc7db2619a00b2e1020f40be5a8
parent04d48a22ba849bb4f522e08f4f47b29bb0c53898 (diff)
hv_netvsc: Clean up an unused parameter in
rndis_filter_set_rss_param() (fate#323887).
-rw-r--r--patches.suse/msft-hv-1457-hv_netvsc-Clean-up-an-unused-parameter-in-rndis_filt.patch65
-rw-r--r--series.conf1
2 files changed, 66 insertions, 0 deletions
diff --git a/patches.suse/msft-hv-1457-hv_netvsc-Clean-up-an-unused-parameter-in-rndis_filt.patch b/patches.suse/msft-hv-1457-hv_netvsc-Clean-up-an-unused-parameter-in-rndis_filt.patch
new file mode 100644
index 0000000000..a09a26f5e2
--- /dev/null
+++ b/patches.suse/msft-hv-1457-hv_netvsc-Clean-up-an-unused-parameter-in-rndis_filt.patch
@@ -0,0 +1,65 @@
+From: Haiyang Zhang <haiyangz@microsoft.com>
+Date: Fri, 1 Sep 2017 14:30:04 -0700
+Patch-mainline: v4.14-rc1
+Subject: hv_netvsc: Clean up an unused parameter in rndis_filter_set_rss_param()
+Git-commit: 715e2ec532f6bffc8ee1cb9282c9e6cbf8809591
+References: fate#323887
+
+This patch removes the parameter, num_queue in
+rndis_filter_set_rss_param(), which is no longer in use.
+
+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/hyperv_net.h | 2 +-
+ drivers/net/hyperv/netvsc_drv.c | 2 +-
+ drivers/net/hyperv/rndis_filter.c | 5 ++---
+ 3 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
+--- a/drivers/net/hyperv/hyperv_net.h
++++ b/drivers/net/hyperv/hyperv_net.h
+@@ -213,7 +213,7 @@ void rndis_filter_update(struct netvsc_device *nvdev);
+ void rndis_filter_device_remove(struct hv_device *dev,
+ struct netvsc_device *nvdev);
+ int rndis_filter_set_rss_param(struct rndis_device *rdev,
+- const u8 *key, int num_queue);
++ const u8 *key);
+ int rndis_filter_receive(struct net_device *ndev,
+ struct netvsc_device *net_dev,
+ struct hv_device *dev,
+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
+@@ -1424,7 +1424,7 @@ static int netvsc_set_rxfh(struct net_device *dev, const u32 *indir,
+ key = rndis_dev->rss_key;
+ }
+
+- return rndis_filter_set_rss_param(rndis_dev, key, ndev->num_chn);
++ return rndis_filter_set_rss_param(rndis_dev, key);
+ }
+
+ /* Hyper-V RNDIS protocol does not have ring in the HW sense.
+diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
+--- a/drivers/net/hyperv/rndis_filter.c
++++ b/drivers/net/hyperv/rndis_filter.c
+@@ -717,7 +717,7 @@ cleanup:
+ }
+
+ int rndis_filter_set_rss_param(struct rndis_device *rdev,
+- const u8 *rss_key, int num_queue)
++ const u8 *rss_key)
+ {
+ struct net_device *ndev = rdev->ndev;
+ struct rndis_request *request;
+@@ -1258,8 +1258,7 @@ struct netvsc_device *rndis_filter_device_add(struct hv_device *dev,
+ atomic_read(&net_device->open_chn) == net_device->num_chn);
+
+ /* ignore failues from setting rss parameters, still have channels */
+- rndis_filter_set_rss_param(rndis_device, netvsc_hash_key,
+- net_device->num_chn);
++ rndis_filter_set_rss_param(rndis_device, netvsc_hash_key);
+ out:
+ if (ret) {
+ net_device->max_chn = 1;
diff --git a/series.conf b/series.conf
index 9c790980de..2ad7260f87 100644
--- a/series.conf
+++ b/series.conf
@@ -1705,6 +1705,7 @@
patches.suse/msft-hv-1454-tracing-hyper-v-Trace-hyperv_mmu_flush_tlb_others.patch
patches.suse/msft-hv-1455-netvsc-cleanup-datapath-switch.patch
patches.suse/msft-hv-1456-netvsc-allow-driver-to-be-removed-even-if-VF-is-pres.patch
+ patches.suse/msft-hv-1457-hv_netvsc-Clean-up-an-unused-parameter-in-rndis_filt.patch
patches.suse/suse-hv-guest-os-id.patch
patches.suse/suse-hv-kvp_on_msg.dbg.patch