nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

cfg80211: remove channel_switch combination check

Browse source 
Driver is now responsible for veryfing if the
switch is possible.

Since this is inherently tricky driver may decide
to disconnect an interface later with
cfg80211_stop_iface().

This doesn't mean driver can accept everything. It
should do it's best to verify requests and reject
them as soon as possible.

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Michal Kazior 2014-06-25 12:35:10 +02:00 committed by Johannes Berg
parent 4c3ebc56d7
commit 97dc94f1d9
2 changed files with 6 additions and 12 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

7
include/net/cfg80211.h
View file

@ -2301,7 +2301,12 @@ struct cfg80211_qos_map {
* reliability. This operation can not fail. * reliability. This operation can not fail.
* @set_coalesce: Set coalesce parameters. * @set_coalesce: Set coalesce parameters.
* *
* @channel_switch: initiate channel-switch procedure (with CSA) * @channel_switch: initiate channel-switch procedure (with CSA). Driver is
* responsible for veryfing if the switch is possible. Since this is
* inherently tricky driver may decide to disconnect an interface later
* with cfg80211_stop_iface(). This doesn't mean driver can accept
* everything. It should do it's best to verify requests and reject them
* as soon as possible.
* *
* @set_qos_map: Set QoS mapping information to the driver * @set_qos_map: Set QoS mapping information to the driver
* *

11
net/wireless/nl80211.c
View file

@ -6013,17 +6013,6 @@ static int nl80211_channel_switch(struct sk_buff *skb, struct genl_info *info)
params.radar_required = true; params.radar_required = true;
} }
/* TODO: I left this here for now. With channel switch, the
* verification is a bit more complicated, because we only do
* it later when the channel switch really happens.
*/
err = cfg80211_can_use_iftype_chan(rdev, wdev, wdev->iftype,
params.chandef.chan,
CHAN_MODE_SHARED,
radar_detect_width);
if (err)
return err;
if (info->attrs[NL80211_ATTR_CH_SWITCH_BLOCK_TX]) if (info->attrs[NL80211_ATTR_CH_SWITCH_BLOCK_TX])
params.block_tx = true; params.block_tx = true;