summaryrefslogtreecommitdiff
path: root/sys/dev/pci/if_iwx.c
diff options
context:
space:
mode:
authorStefan Sperling <stsp@cvs.openbsd.org>2021-09-03 11:41:42 +0000
committerStefan Sperling <stsp@cvs.openbsd.org>2021-09-03 11:41:42 +0000
commitd6f5b90a943b82adb77749c6c0fe3728b7313c70 (patch)
tree8c63fc7bff6a9cf8a4f8556bb0f423b5f458eb04 /sys/dev/pci/if_iwx.c
parente58a28303578b946531dc0d211fb2713498bb7c8 (diff)
Ensure that iwm(4) and iwx(4) will reload firmware from disk on down/up,
and will not do so during resume. Tested by kevlo@ on iwx(4) and by myself on iwm(4).
Diffstat (limited to 'sys/dev/pci/if_iwx.c')
-rw-r--r--sys/dev/pci/if_iwx.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/pci/if_iwx.c b/sys/dev/pci/if_iwx.c
index f43fe1db2ef..06f0b877872 100644
--- a/sys/dev/pci/if_iwx.c
+++ b/sys/dev/pci/if_iwx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwx.c,v 1.101 2021/09/02 13:44:10 stsp Exp $ */
+/* $OpenBSD: if_iwx.c,v 1.102 2021/09/03 11:41:41 stsp Exp $ */
/*
* Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
@@ -8204,6 +8204,8 @@ iwx_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
case SIOCSIFFLAGS:
if (ifp->if_flags & IFF_UP) {
if (!(ifp->if_flags & IFF_RUNNING)) {
+ /* Force reload of firmware image from disk. */
+ sc->sc_fw.fw_status = IWX_FW_STATUS_NONE;
err = iwx_init(ifp);
}
} else {