Home Home > GIT Browse > SLE12-SP4-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2019-06-10 15:08:25 +0200
committerMichal Suchanek <msuchanek@suse.de>2019-06-10 15:10:30 +0200
commit0316242df8aa4b70004a3a0b9722ecf593c76966 (patch)
tree641d48a4dd283ca24425b53fdf10e25c1ab80639
parent4b7d69cb1867763bedde4a736b950d135637cec8 (diff)
ibmvnic: Do not close unopened driver during reset
(bsc#1137752).
-rw-r--r--patches.drivers/ibmvnic-Do-not-close-unopened-driver-during-reset.patch38
-rw-r--r--series.conf3
2 files changed, 41 insertions, 0 deletions
diff --git a/patches.drivers/ibmvnic-Do-not-close-unopened-driver-during-reset.patch b/patches.drivers/ibmvnic-Do-not-close-unopened-driver-during-reset.patch
new file mode 100644
index 0000000000..c5a7b22902
--- /dev/null
+++ b/patches.drivers/ibmvnic-Do-not-close-unopened-driver-during-reset.patch
@@ -0,0 +1,38 @@
+From 1f94608b0ce141be5286dde31270590bdf35b86a Mon Sep 17 00:00:00 2001
+From: Thomas Falcon <tlfalcon@linux.ibm.com>
+Date: Fri, 7 Jun 2019 16:03:53 -0500
+Subject: [PATCH] ibmvnic: Do not close unopened driver during reset
+
+References: bsc#1137752
+Patch-mainline: queued
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
+Git-commit: 1f94608b0ce141be5286dde31270590bdf35b86a
+
+Check driver state before halting it during a reset. If the driver is
+not running, do nothing. Otherwise, a request to deactivate a down link
+can cause an error and the reset will fail.
+
+Signed-off-by: Thomas Falcon <tlfalcon@linux.ibm.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Acked-by: Michal Suchanek <msuchanek@suse.de>
+---
+ drivers/net/ethernet/ibm/ibmvnic.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
+index 3da392bfd659..bc2a91205eec 100644
+--- a/drivers/net/ethernet/ibm/ibmvnic.c
++++ b/drivers/net/ethernet/ibm/ibmvnic.c
+@@ -1745,7 +1745,8 @@ static int do_reset(struct ibmvnic_adapter *adapter,
+
+ ibmvnic_cleanup(netdev);
+
+- if (adapter->reset_reason != VNIC_RESET_MOBILITY &&
++ if (reset_state == VNIC_OPEN &&
++ adapter->reset_reason != VNIC_RESET_MOBILITY &&
+ adapter->reset_reason != VNIC_RESET_FAILOVER) {
+ rc = __ibmvnic_close(netdev);
+ if (rc)
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index ea294b075d..583e28ed22 100644
--- a/series.conf
+++ b/series.conf
@@ -22300,6 +22300,9 @@
patches.suse/kernel-signal.c-trace_signal_deliver-when-signal_gro.patch
patches.arch/powerpc-perf-Fix-MMCRA-corruption-by-bhrb_filter.patch
+ # davem/net
+ patches.drivers/ibmvnic-Do-not-close-unopened-driver-during-reset.patch
+
# dhowells/linux-fs keys-uefi
patches.suse/0001-KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch
patches.suse/0002-efi-Add-EFI-signature-data-types.patch