Skip to content

Commit 0f2a4af

Browse files
tohojotorvalds
authored andcommitted
wifi: ath9k: Don't mark channelmap stack variable read-only in ath9k_mci_update_wlan_channels()
This partially reverts commit e161d4b. Turns out the channelmap variable is not actually read-only, it's modified through the MCI_GPM_CLR_CHANNEL_BIT() macro further down in the function, so making it read-only causes page faults when that code is hit. Link: https://bugzilla.kernel.org/show_bug.cgi?id=217183 Link: https://lore.kernel.org/r/[email protected] Fixes: e161d4b ("wifi: ath9k: Make arrays prof_prio and channelmap static const") Cc: [email protected] Signed-off-by: Toke Høiland-Jørgensen <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 6a66fdd commit 0f2a4af

File tree

1 file changed

+1
-3
lines changed
  • drivers/net/wireless/ath/ath9k

1 file changed

+1
-3
lines changed

drivers/net/wireless/ath/ath9k/mci.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -646,9 +646,7 @@ void ath9k_mci_update_wlan_channels(struct ath_softc *sc, bool allow_all)
646646
struct ath_hw *ah = sc->sc_ah;
647647
struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
648648
struct ath9k_channel *chan = ah->curchan;
649-
static const u32 channelmap[] = {
650-
0x00000000, 0xffff0000, 0xffffffff, 0x7fffffff
651-
};
649+
u32 channelmap[] = {0x00000000, 0xffff0000, 0xffffffff, 0x7fffffff};
652650
int i;
653651
s16 chan_start, chan_end;
654652
u16 wlan_chan;

0 commit comments

Comments
 (0)