aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@intel.com>2014-11-07 07:31:36 -0500
committerJohannes Berg <johannes.berg@intel.com>2014-11-10 04:20:17 -0500
commit2f4572930dbd79216294a94e331478513c65df78 (patch)
tree5e434e727454d1aa5d50ef798912a3553546d2f5 /net/mac80211
parentf8d7552e945d38bd8d2e9c23aebf98042ce12302 (diff)
mac80211: send channel switch started notifications
Send a channel switch notification to userspace when a channel switch is requested or when we react to a remote CSA. Signed-off-by: Luciano Coelho <luciano.coelho@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/cfg.c3
-rw-r--r--net/mac80211/mlme.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 76e794edd960..a43a14863ecb 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -3195,6 +3195,9 @@ __ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
3195 ieee80211_stop_vif_queues(local, sdata, 3195 ieee80211_stop_vif_queues(local, sdata,
3196 IEEE80211_QUEUE_STOP_REASON_CSA); 3196 IEEE80211_QUEUE_STOP_REASON_CSA);
3197 3197
3198 cfg80211_ch_switch_started_notify(sdata->dev, &sdata->csa_chandef,
3199 params->count);
3200
3198 if (changed) { 3201 if (changed) {
3199 ieee80211_bss_info_change_notify(sdata, changed); 3202 ieee80211_bss_info_change_notify(sdata, changed);
3200 drv_channel_switch_beacon(sdata, &params->chandef); 3203 drv_channel_switch_beacon(sdata, &params->chandef);
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 213a420704a6..947250077615 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1205,6 +1205,9 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata,
1205 IEEE80211_QUEUE_STOP_REASON_CSA); 1205 IEEE80211_QUEUE_STOP_REASON_CSA);
1206 mutex_unlock(&local->mtx); 1206 mutex_unlock(&local->mtx);
1207 1207
1208 cfg80211_ch_switch_started_notify(sdata->dev, &csa_ie.chandef,
1209 csa_ie.count);
1210
1208 if (local->ops->channel_switch) { 1211 if (local->ops->channel_switch) {
1209 /* use driver's channel switch callback */ 1212 /* use driver's channel switch callback */
1210 drv_channel_switch(local, sdata, &ch_switch); 1213 drv_channel_switch(local, sdata, &ch_switch);