iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac80211: make mgmt_tx accept a NULL channel

Browse Source 
cfg80211 passes a NULL channel to mgmt_tx if the frame has
to be sent on the one currently in use by the device.
Make the implementation of mgmt_tx correctly handle this
case. Fail if offchan is required.

Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
[fix RCU locking]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Antonio Quartulli 2013-06-11 14:20:00 +02:00 committed by Johannes Berg
parent 3d124ea27a
commit f7aeb6fb1a
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net/mac80211/cfg.c
View File

@ -2841,6 +2841,12 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
/* configurations requiring offchan cannot work if no channel has been
* specified
*/
if (need_offchan && !chan)
return -EINVAL;
mutex_lock(&local->mtx); mutex_lock(&local->mtx);
/* Check if the operating channel is the requested channel */ /* Check if the operating channel is the requested channel */
@ -2850,10 +2856,15 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
rcu_read_lock(); rcu_read_lock();
chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf); chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);
if (chanctx_conf) if (chanctx_conf) {
need_offchan = chan != chanctx_conf->def.chan; need_offchan = chan && (chan != chanctx_conf->def.chan);
else } else if (!chan) {
ret = -EINVAL;
rcu_read_unlock();
goto out_unlock;
} else {
need_offchan = true; need_offchan = true;
}
rcu_read_unlock(); rcu_read_unlock();
} }