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:28 +0200
commitca9c11fd0f7f6a0dd097071a588fa61cd3f38667 (patch)
treee6e13876ae46151bdaeb1ffdb73dc87a46e67a72
parent56519997c96cd6756ac96e9e097e73171597ba06 (diff)
hv_netvsc: Clean up unused parameter from
netvsc_get_rss_hash_opts() (fate#323887).
-rw-r--r--patches.suse/msft-hv-1447-hv_netvsc-Clean-up-unused-parameter-from-netvsc_get_.patch38
-rw-r--r--series.conf1
2 files changed, 39 insertions, 0 deletions
diff --git a/patches.suse/msft-hv-1447-hv_netvsc-Clean-up-unused-parameter-from-netvsc_get_.patch b/patches.suse/msft-hv-1447-hv_netvsc-Clean-up-unused-parameter-from-netvsc_get_.patch
new file mode 100644
index 0000000000..7775178312
--- /dev/null
+++ b/patches.suse/msft-hv-1447-hv_netvsc-Clean-up-unused-parameter-from-netvsc_get_.patch
@@ -0,0 +1,38 @@
+From: Haiyang Zhang <haiyangz@microsoft.com>
+Date: Mon, 21 Aug 2017 19:22:38 -0700
+Patch-mainline: v4.14-rc1
+Subject: hv_netvsc: Clean up unused parameter from netvsc_get_rss_hash_opts()
+Git-commit: 4c0e2cbfd9b519722529526f4d87f8aab3c32ffd
+References: fate#323887
+
+The parameter "nvdev" is not 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/netvsc_drv.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+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
+@@ -1228,8 +1228,7 @@ static void netvsc_get_strings(struct net_device *dev, u32 stringset, u8 *data)
+ }
+
+ static int
+-netvsc_get_rss_hash_opts(struct netvsc_device *nvdev,
+- struct ethtool_rxnfc *info)
++netvsc_get_rss_hash_opts(struct ethtool_rxnfc *info)
+ {
+ info->data = RXH_IP_SRC | RXH_IP_DST;
+
+@@ -1267,7 +1266,7 @@ netvsc_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,
+ return 0;
+
+ case ETHTOOL_GRXFH:
+- return netvsc_get_rss_hash_opts(nvdev, info);
++ return netvsc_get_rss_hash_opts(info);
+ }
+ return -EOPNOTSUPP;
+ }
diff --git a/series.conf b/series.conf
index 0badd81676..29b7015d67 100644
--- a/series.conf
+++ b/series.conf
@@ -1697,6 +1697,7 @@
patches.suse/msft-hv-1444-vmbus-remove-unused-vmubs_sendpacket_pagebuffer_ctl.patch
patches.suse/msft-hv-1445-vmbus-remove-unused-vmbus_sendpacket_ctl.patch
patches.suse/msft-hv-1446-hv_netvsc-Clean-up-unused-parameter-from-netvsc_get_.patch
+ patches.suse/msft-hv-1447-hv_netvsc-Clean-up-unused-parameter-from-netvsc_get_.patch
patches.suse/suse-hv-guest-os-id.patch
patches.suse/suse-hv-kvp_on_msg.dbg.patch