summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-01-24 10:57:56 -0500
committerDavid S. Miller <davem@davemloft.net>2017-01-24 10:57:56 -0500
commitbaae29d653f899fca20bc23770a0dcc0195ebf4f (patch)
tree113d9fc5f3ea86b84b9ab6052cfe2f6bc2d5cc65
parent4078b76cac68e50ccf1f76a74e7d3d5788aec3fe (diff)
parent115865fa0826ed18ca04717cf72d0fe874c0fe7f (diff)
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.c2
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;