diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2017-01-23 09:29:09 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-01-24 16:31:54 +0100 |
| commit | 115865fa0826ed18ca04717cf72d0fe874c0fe7f (patch) | |
| tree | 113d9fc5f3ea86b84b9ab6052cfe2f6bc2d5cc65 | |
| parent | net: dsa: Check return value of phy_connect_direct() (diff) | |
| download | linux-115865fa0826ed18ca04717cf72d0fe874c0fe7f.tar.xz linux-115865fa0826ed18ca04717cf72d0fe874c0fe7f.zip | |
mac80211: don't try to sleep in rate_control_rate_init()
In my previous patch, I missed that rate_control_rate_init() is
called from some places that cannot sleep, so it cannot call
ieee80211_recalc_min_chandef(). Remove that call for now to fix
the context bug, we'll have to find a different way to fix the
minimum channel width issue.
Fixes: 96aa2e7cf126 ("mac80211: calculate min channel width correctly")
Reported-by: Xiaolong Ye (via lkp-robot) <xiaolong.ye@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/rate.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c index 9e2641d45587..206698bc93f4 100644 --- a/net/mac80211/rate.c +++ b/net/mac80211/rate.c @@ -40,8 +40,6 @@ void rate_control_rate_init(struct sta_info *sta) ieee80211_sta_set_rx_nss(sta); - ieee80211_recalc_min_chandef(sta->sdata); - if (!ref) return; |