Home Home > GIT Browse > SLE12-SP4-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2019-06-10 12:55:00 +0200
committerMichal Suchanek <msuchanek@suse.de>2019-06-10 12:56:11 +0200
commit5c02fc174c30ae79b6f5b00605a0b9ffbfe91a9d (patch)
treef0745c5967d295386f75606b23d8a32d7d462b61
parent93d871745750eb6e05a96225b52484685f233701 (diff)
ibmvnic: remove set but not used variable 'netdev'
(bsc#1137739).
-rw-r--r--patches.drivers/ibmvnic-remove-set-but-not-used-variable-netdev.patch46
-rw-r--r--series.conf1
2 files changed, 47 insertions, 0 deletions
diff --git a/patches.drivers/ibmvnic-remove-set-but-not-used-variable-netdev.patch b/patches.drivers/ibmvnic-remove-set-but-not-used-variable-netdev.patch
new file mode 100644
index 0000000000..adf15e3f8f
--- /dev/null
+++ b/patches.drivers/ibmvnic-remove-set-but-not-used-variable-netdev.patch
@@ -0,0 +1,46 @@
+From 53a6b206e36f160dbaa5727e68f8418de0b10bbf Mon Sep 17 00:00:00 2001
+From: YueHaibing <yuehaibing@huawei.com>
+Date: Wed, 3 Apr 2019 15:54:09 +0800
+Subject: [PATCH] ibmvnic: remove set but not used variable 'netdev'
+
+References: bsc#1137739
+Patch-mainline: v5.2-rc1
+Git-commit: 53a6b206e36f160dbaa5727e68f8418de0b10bbf
+
+Fixes gcc '-Wunused-but-set-variable' warning:
+
+drivers/net/ethernet/ibm/ibmvnic.c: In function '__ibmvnic_reset':
+drivers/net/ethernet/ibm/ibmvnic.c:1971:21: warning: variable 'netdev' set but not used [-Wunused-but-set-variable]
+
+It's never used since introduction in
+commit ed651a10875f ("ibmvnic: Updated reset handling")
+
+Signed-off-by: YueHaibing <yuehaibing@huawei.com>
+Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Acked-by: Michal Suchanek <msuchanek@suse.de>
+---
+ drivers/net/ethernet/ibm/ibmvnic.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
+index 25b8e04ef11a..20c4e0835ba8 100644
+--- a/drivers/net/ethernet/ibm/ibmvnic.c
++++ b/drivers/net/ethernet/ibm/ibmvnic.c
+@@ -1968,13 +1968,11 @@ static void __ibmvnic_reset(struct work_struct *work)
+ {
+ struct ibmvnic_rwi *rwi;
+ struct ibmvnic_adapter *adapter;
+- struct net_device *netdev;
+ bool we_lock_rtnl = false;
+ u32 reset_state;
+ int rc = 0;
+
+ adapter = container_of(work, struct ibmvnic_adapter, ibmvnic_reset);
+- netdev = adapter->netdev;
+
+ /* netif_set_real_num_xx_queues needs to take rtnl lock here
+ * unless wait_for_reset is set, in which case the rtnl lock
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 7df807908b..9f8d68a396 100644
--- a/series.conf
+++ b/series.conf
@@ -22096,6 +22096,7 @@
patches.fixes/0001-of-fix-clang-Wunsequenced-for-be32_to_cpu.patch
patches.drivers/ibmvnic-Report-actual-backing-device-speed-and-duple.patch
patches.fixes/openvswitch-add-seqadj-extension-when-NAT-is-used.patch
+ patches.drivers/ibmvnic-remove-set-but-not-used-variable-netdev.patch
patches.drivers/net-hns3-remove-resetting-check-in-hclgevf_reset_tas.patch
patches.drivers/bpf-Add-missed-newline-in-verifier-verbose-log.patch
patches.drivers/b43-shut-up-clang-Wuninitialized-variable-warning.patch