From a7c59ddfc05eea5d8d20433c52879344dccbf57e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 2 Mar 2013 19:05:47 +0100 Subject: [PATCH] --- yaml --- r: 361067 b: refs/heads/master c: 801d929ca7d935ee199fd61d8ef914f51e892270 h: refs/heads/master i: 361065: fa323693c804a6158bdb16c70c5bc8c1d513ebc8 361063: ef898efe82fcbfc68629ae4979b6ccefcf9d69d8 v: v3 --- [refs] | 2 +- trunk/net/mac80211/iface.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b721b0092261..f55afca78ce1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24af717c35189f7a83c34e637256ccb7295a617b +refs/heads/master: 801d929ca7d935ee199fd61d8ef914f51e892270 diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c index 640afab304d7..baaa8608e52d 100644 --- a/trunk/net/mac80211/iface.c +++ b/trunk/net/mac80211/iface.c @@ -541,6 +541,9 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) ieee80211_adjust_monitor_flags(sdata, 1); ieee80211_configure_filter(local); + mutex_lock(&local->mtx); + ieee80211_recalc_idle(local); + mutex_unlock(&local->mtx); netif_carrier_on(dev); break; @@ -812,6 +815,9 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, ieee80211_adjust_monitor_flags(sdata, -1); ieee80211_configure_filter(local); + mutex_lock(&local->mtx); + ieee80211_recalc_idle(local); + mutex_unlock(&local->mtx); break; case NL80211_IFTYPE_P2P_DEVICE: /* relies on synchronize_rcu() below */