diff options
| author | David S. Miller | 2017-01-24 16:57:56 +0100 |
|---|---|---|
| committer | David S. Miller | 2017-01-24 16:57:56 +0100 |
| commit | baae29d653f899fca20bc23770a0dcc0195ebf4f (patch) | |
| tree | 113d9fc5f3ea86b84b9ab6052cfe2f6bc2d5cc65 | |
| parent | net: dsa: Check return value of phy_connect_direct() (diff) | |
| parent | mac80211: don't try to sleep in rate_control_rate_init() (diff) | |
| download | kernel-qcow2-linux-baae29d653f899fca20bc23770a0dcc0195ebf4f.tar.gz kernel-qcow2-linux-baae29d653f899fca20bc23770a0dcc0195ebf4f.tar.xz kernel-qcow2-linux-baae29d653f899fca20bc23770a0dcc0195ebf4f.zip | |
Merge tag 'mac80211-for-davem-2017-01-24' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
A single fix, for a sleeping context problem found by LTP.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -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; |