From 7ff2f1046287cd4ad2f866acf13c97826f40c4c9 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 1 Jul 2022 22:09:06 -0400 Subject: [PATCH] OpenBSD wlan drivers: We cannot back out of initialization at preinit. Otherwise we get KDLs. Fixes #17811. --- .../kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c | 3 +-- .../kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c b/src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c index 1649a0857e..3794b77643 100644 --- a/src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c +++ b/src/add-ons/kernel/drivers/network/wlan/iaxwifi200/dev/pci/if_iwx.c @@ -11029,8 +11029,7 @@ iwx_attach(struct device *parent, struct device *self, void *aux) ic->ic_ampdu_tx_stop = NULL; #ifdef __HAIKU__ - if (iwx_preinit(sc) != 0) - goto fail4; + iwx_preinit(sc); #else /* * We cannot read the MAC address without loading the diff --git a/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c b/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c index 1c9420bfe8..214d257058 100644 --- a/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c +++ b/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/pci/if_iwm.c @@ -12131,8 +12131,7 @@ iwm_attach(struct device *parent, struct device *self, void *aux) ic->ic_ampdu_tx_start = iwm_ampdu_tx_start; ic->ic_ampdu_tx_stop = iwm_ampdu_tx_stop; #ifdef __HAIKU__ - if (iwm_preinit(sc) != 0) - goto fail4; + iwm_preinit(sc); #else /* * We cannot read the MAC address without loading the