diff options
author | Michal Kazior <michal.kazior@tieto.com> | 2014-06-25 06:35:10 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-06-25 12:06:20 -0400 |
commit | 97dc94f1d933c9df2c0b327066ea130c0e92083f (patch) | |
tree | 9d0e047ed23298d9351011c0a19773ccef041a1d /net/wireless | |
parent | 4c3ebc56d7561526524ec62c61aa3e2040b71f6e (diff) |
cfg80211: remove channel_switch combination check
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>
Diffstat (limited to 'net/wireless')
-rw-r--r-- | net/wireless/nl80211.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 8f46b8ffbcf6..c10295138eb5 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c | |||
@@ -6013,17 +6013,6 @@ skip_beacons: | |||
6013 | params.radar_required = true; | 6013 | params.radar_required = true; |
6014 | } | 6014 | } |
6015 | 6015 | ||
6016 | /* TODO: I left this here for now. With channel switch, the | ||
6017 | * verification is a bit more complicated, because we only do | ||
6018 | * it later when the channel switch really happens. | ||
6019 | */ | ||
6020 | err = cfg80211_can_use_iftype_chan(rdev, wdev, wdev->iftype, | ||
6021 | params.chandef.chan, | ||
6022 | CHAN_MODE_SHARED, | ||
6023 | radar_detect_width); | ||
6024 | if (err) | ||
6025 | return err; | ||
6026 | |||
6027 | if (info->attrs[NL80211_ATTR_CH_SWITCH_BLOCK_TX]) | 6016 | if (info->attrs[NL80211_ATTR_CH_SWITCH_BLOCK_TX]) |
6028 | params.block_tx = true; | 6017 | params.block_tx = true; |
6029 | 6018 | ||