mac80211: avoid crashing when no scan sdata
Johannes Berg
maintainerPATCH 1/1 mac80211: avoid crashing when no scan sdata
Using the scan_sdata variable here is terribly wrong, if there has never been a scan then we fail. However, we need a bandaid...
Signed-off-by Johannes Berg <[email protected]>
Cc [email protected] [2.6.29]
---
John, for 2.6.29 and 2.6.30 we need this bandaid -- my new work to properly fix this can only go into 2.6.31.
net/mac80211/mlme.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/mac80211/mlme.c +2 -1
@@ -2197,12 +2197,13 @@ void ieee80211_dynamic_ps_enable_work(ststruct ieee80211_local *local = container_of(work, struct ieee80211_local, dynamic_ps_enable_work); +/* XXX: using scan_sdata is completely broken! */ struct ieee80211_sub_if_data *sdata = local->scan_sdata;if (local->hw.conf.flags &IEEE80211_CONF_PS )return ; -if (local->hw.flags &IEEE80211_HW_PS_NULLFUNC_STACK ) +if (local->hw.flags &IEEE80211_HW_PS_NULLFUNC_STACK && sdata)ieee80211_send_nullfunc (local, sdata,1 ); local->hw.conf.flags |=IEEE80211_CONF_PS ;
Quoted 9 lines · Johannes Berg
Using the
scan_sdatavariable here is terribly wrong, if there has never been a scan then we fail. However, we need a bandaid...Signed-off-by Johannes Berg <[email protected]>Cc [email protected] [2.6.29]---
John, for 2.6.29 and 2.6.30 we need this bandaid -- my new work to properly fix this can only go into 2.6.31.
Sorry, I did this mistake. Thanks for fixing it!
Signature · 1 line
Kalle Valo