From 17af7f62989455488ecd81dbce1758b8920c8504 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sun, 5 Jul 2020 21:10:32 -0400 Subject: [PATCH] idualwifi7260: Re-enable multiframe RX. It no longer causes KDLs; probably the fix for the use-after-frees on 9xxx devices also fixed whatever caused this problem. --- .../drivers/network/wlan/idualwifi7260/dev/iwm/if_iwm.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/iwm/if_iwm.c b/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/iwm/if_iwm.c index 39e357e412..625b83595c 100644 --- a/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/iwm/if_iwm.c +++ b/src/add-ons/kernel/drivers/network/wlan/idualwifi7260/dev/iwm/if_iwm.c @@ -1499,10 +1499,6 @@ iwm_nic_rx_legacy_init(struct iwm_softc *sc) IWM_WRITE(sc, IWM_FH_MEM_RCSR_CHNL0_CONFIG_REG, IWM_FH_RCSR_RX_CONFIG_CHNL_EN_ENABLE_VAL | IWM_FH_RCSR_CHNL0_RX_IGNORE_RXF_EMPTY | /* HW bug */ -//#ifdef __HAIKU__ - /* multi-frame RX seems to cause UAFs and double-frees */ - IWM_FH_RCSR_CHNL0_RX_CONFIG_SINGLE_FRAME_MSK | -//#endif IWM_FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL | IWM_FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_4K | (IWM_RX_RB_TIMEOUT << IWM_FH_RCSR_RX_CONFIG_REG_IRQ_RBTH_POS) |