diff options
| author | Luciano Coelho <luciano.coelho@intel.com> | 2014-02-13 10:31:59 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-04-09 10:55:43 +0200 |
| commit | 73de86a38962b18edad3205c2358599dd9c83e9f (patch) | |
| tree | caf27b6e5000427c940a07d325d1210417ba87ad /net/wireless/ibss.c | |
| parent | cfg80211/mac80211: refactor cfg80211_chandef_dfs_required() (diff) | |
| download | linux-73de86a38962b18edad3205c2358599dd9c83e9f.tar.xz linux-73de86a38962b18edad3205c2358599dd9c83e9f.zip | |
cfg80211/mac80211: move interface counting for combination check to mac80211
Move the counting part of the interface combination check from
cfg80211 to mac80211.
This is needed to simplify locking when the driver has to perform a
combination check by itself (eg. with channel-switch).
Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/ibss.c')
| -rw-r--r-- | net/wireless/ibss.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c index a6b5bdad039c..faf4961d47d8 100644 --- a/net/wireless/ibss.c +++ b/net/wireless/ibss.c @@ -135,6 +135,10 @@ static int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev, radar_detect_width = BIT(params->chandef.width); } + /* TODO: We need to check the combinations at this point, we + * probably must move this call down to join_ibss() in + * mac80211. + */ err = cfg80211_can_use_iftype_chan(rdev, wdev, wdev->iftype, check_chan, (params->channel_fixed && |