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
commit56519997c96cd6756ac96e9e097e73171597ba06 (patch)
tree7bb1431fbf00aa1b9c23d2f185b0389542aa1432
parenta9f85599586ab91d171bb714a6fc6125e0a54dbb (diff)
hv_netvsc: Clean up unused parameter from netvsc_get_hash()
-rw-r--r--patches.suse/msft-hv-1446-hv_netvsc-Clean-up-unused-parameter-from-netvsc_get_.patch37
-rw-r--r--series.conf1
2 files changed, 38 insertions, 0 deletions
diff --git a/patches.suse/msft-hv-1446-hv_netvsc-Clean-up-unused-parameter-from-netvsc_get_.patch b/patches.suse/msft-hv-1446-hv_netvsc-Clean-up-unused-parameter-from-netvsc_get_.patch
new file mode 100644
index 0000000000..bb05737b5e
--- /dev/null
+++ b/patches.suse/msft-hv-1446-hv_netvsc-Clean-up-unused-parameter-from-netvsc_get_.patch
@@ -0,0 +1,37 @@
+From: Haiyang Zhang <haiyangz@microsoft.com>
+Date: Mon, 21 Aug 2017 19:22:37 -0700
+Patch-mainline: v4.14-rc1
+Subject: hv_netvsc: Clean up unused parameter from netvsc_get_hash()
+Git-commit: fcba1569a0c87cea40404af9a29b319f4e491839
+References: fate#323887
+
+The parameter "sk" 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 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 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
+@@ -193,7 +193,7 @@ static void *init_ppi_data(struct rndis_message *msg, u32 ppi_size,
+ /* Azure hosts don't support non-TCP port numbers in hashing yet. We compute
+ * hash for non-TCP traffic with only IP numbers.
+ */
+-static inline u32 netvsc_get_hash(struct sk_buff *skb, struct sock *sk)
++static inline u32 netvsc_get_hash(struct sk_buff *skb)
+ {
+ struct flow_keys flow;
+ u32 hash;
+@@ -227,7 +227,7 @@ static inline int netvsc_get_tx_queue(struct net_device *ndev,
+ struct sock *sk = skb->sk;
+ int q_idx;
+
+- q_idx = ndc->tx_send_table[netvsc_get_hash(skb, sk) &
++ q_idx = ndc->tx_send_table[netvsc_get_hash(skb) &
+ (VRSS_SEND_TAB_SIZE - 1)];
+
+ /* If queue index changed record the new value */
diff --git a/series.conf b/series.conf
index fb0b7bc568..0badd81676 100644
--- a/series.conf
+++ b/series.conf
@@ -1696,6 +1696,7 @@
patches.suse/msft-hv-1443-vmbus-remove-unused-vmbus_sendpacket_multipagebuffer.patch
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/suse-hv-guest-os-id.patch
patches.suse/suse-hv-kvp_on_msg.dbg.patch