projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f9fff67
)
wifi: ath9k: Don't mark channelmap stack variable read-only in ath9k_mci_update_wlan_...
author
Toke Høiland-Jørgensen
<toke@toke.dk>
Mon, 17 Apr 2023 10:35:03 +0000
(13:35 +0300)
committer
Kalle Valo
<quic_kvalo@quicinc.com>
Wed, 19 Apr 2023 14:24:47 +0000
(17:24 +0300)
This partially reverts commit
e161d4b60ae3a5356e07202e0bfedb5fad82c6aa
.
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
Fixes:
e161d4b60ae3
("wifi: ath9k: Make arrays prof_prio and channelmap static const")
Cc: stable@vger.kernel.org
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link:
https://lore.kernel.org/r/20230413214118.153781-1-toke@toke.dk
drivers/net/wireless/ath/ath9k/mci.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/ath/ath9k/mci.c
b/drivers/net/wireless/ath/ath9k/mci.c
index
3363fc4
..
a084500
100644
(file)
--- a/
drivers/net/wireless/ath/ath9k/mci.c
+++ b/
drivers/net/wireless/ath/ath9k/mci.c
@@
-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 ath9k_hw_mci *mci = &ah->btcoex_hw.mci;
struct ath9k_channel *chan = ah->curchan;
- static const u32 channelmap[] = {
- 0x00000000, 0xffff0000, 0xffffffff, 0x7fffffff
- };
+ u32 channelmap[] = {0x00000000, 0xffff0000, 0xffffffff, 0x7fffffff};
int i;
s16 chan_start, chan_end;
u16 wlan_chan;