Commit 0f2a4af2 authored by Toke Høiland-Jørgensen's avatar Toke Høiland-Jørgensen Committed by Linus Torvalds

wifi: ath9k: Don't mark channelmap stack variable read-only in ath9k_mci_update_wlan_channels()

This partially reverts commit e161d4b6.

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/20230413214118.153781-1-toke@toke.dk
Fixes: e161d4b6 ("wifi: ath9k: Make arrays prof_prio and channelmap static const")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarToke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6a66fdd2
...@@ -646,9 +646,7 @@ void ath9k_mci_update_wlan_channels(struct ath_softc *sc, bool allow_all) ...@@ -646,9 +646,7 @@ void ath9k_mci_update_wlan_channels(struct ath_softc *sc, bool allow_all)
struct ath_hw *ah = sc->sc_ah; struct ath_hw *ah = sc->sc_ah;
struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci; struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
struct ath9k_channel *chan = ah->curchan; struct ath9k_channel *chan = ah->curchan;
static const u32 channelmap[] = { u32 channelmap[] = {0x00000000, 0xffff0000, 0xffffffff, 0x7fffffff};
0x00000000, 0xffff0000, 0xffffffff, 0x7fffffff
};
int i; int i;
s16 chan_start, chan_end; s16 chan_start, chan_end;
u16 wlan_chan; u16 wlan_chan;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment