From e71130c53ced644c8f129cf2af78f308106a306e Mon Sep 17 00:00:00 2001 From: stsp Date: Mon, 6 Mar 2023 11:33:57 +0000 Subject: [PATCH] Avoid trying to remove keys if the station is not active in iwx firmware. Fixes a firmware panic I encountered while working on firmware upgrades. --- sys/dev/pci/if_iwx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/if_iwx.c b/sys/dev/pci/if_iwx.c index b0f217634d7..b1d8498a5fb 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.166 2023/03/06 11:30:46 stsp Exp $ */ +/* $OpenBSD: if_iwx.c,v 1.167 2023/03/06 11:33:57 stsp Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh @@ -8577,6 +8577,9 @@ iwx_delete_key(struct ieee80211com *ic, struct ieee80211_node *ni, struct iwx_softc *sc = ic->ic_softc; struct iwx_add_sta_key_cmd cmd; + if ((sc->sc_flags & IWX_FLAG_STA_ACTIVE) == 0) + return; + if (k->k_cipher != IEEE80211_CIPHER_CCMP) { /* Fallback to software crypto for other ciphers. */ ieee80211_delete_key(ic, ni, k); -- 2.20.1