diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-02-13 14:43:02 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-13 14:43:02 -0500 |
| commit | 0e028ab0fb2da47fd235dafd4159859892e73d08 (patch) | |
| tree | e9e1348372b413e6b1b503209582b03c9005f614 /net/mac80211/ht.c | |
| parent | e57f1734d87aa0e9a00905ed08888f0c62f56227 (diff) | |
| parent | 348f7d4adee97f222e3ad9ff97956ca3793d11c6 (diff) | |
| download | linux-0e028ab0fb2da47fd235dafd4159859892e73d08.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211/ht.c')
| -rw-r--r-- | net/mac80211/ht.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c index dc3c28002e3e..afbe2b203c3e 100644 --- a/net/mac80211/ht.c +++ b/net/mac80211/ht.c @@ -466,7 +466,9 @@ void ieee80211_request_smps_ap_work(struct work_struct *work) u.ap.request_smps_work); sdata_lock(sdata); - __ieee80211_request_smps_ap(sdata, sdata->u.ap.driver_smps_mode); + if (sdata_dereference(sdata->u.ap.beacon, sdata)) + __ieee80211_request_smps_ap(sdata, + sdata->u.ap.driver_smps_mode); sdata_unlock(sdata); } |