diff options
author | Luciano Coelho <luciano.coelho@intel.com> | 2014-02-20 09:36:23 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-02-21 03:37:46 -0500 |
commit | 6658ab80fd4ef940fc2366ddb66690a15ea69c18 (patch) | |
tree | 9f86aa5fbd6a73e965d1e99e5e737a0181541b6d /net/mac80211/ibss.c | |
parent | 7b2106aea2638948806df248215b14efd84c5ffc (diff) |
mac80211: ibss: handle cfg80211_chandef_dfs_required() error codes
Error codes returned by cfg80211_chandef_dfs_required() are ignored
when trying to join an IBSS. Fix this by printing an error and
returning.
Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ibss.c')
-rw-r--r-- | net/mac80211/ibss.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 4453e2725e40..e458ca0dffec 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c | |||
@@ -283,6 +283,11 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, | |||
283 | 283 | ||
284 | err = cfg80211_chandef_dfs_required(sdata->local->hw.wiphy, | 284 | err = cfg80211_chandef_dfs_required(sdata->local->hw.wiphy, |
285 | &chandef); | 285 | &chandef); |
286 | if (err < 0) { | ||
287 | sdata_info(sdata, | ||
288 | "Failed to join IBSS, invalid chandef\n"); | ||
289 | return; | ||
290 | } | ||
286 | if (err > 0) { | 291 | if (err > 0) { |
287 | if (!ifibss->userspace_handles_dfs) { | 292 | if (!ifibss->userspace_handles_dfs) { |
288 | sdata_info(sdata, | 293 | sdata_info(sdata, |