diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-11-26 17:31:40 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-12-05 09:32:58 -0500 |
commit | e60c7744f8aa77bcbcb0b294596d6c87445d1200 (patch) | |
tree | 7039c0906d825b035595a826cd117fd08242d0ad /net/mac80211/iface.c | |
parent | fee52678dbda2099a25243e79da98dc390e1939a (diff) |
cfg80211: handle SIOCGIWMODE/SIOCSIWMODE
further reducing wext code in mac80211.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r-- | net/mac80211/iface.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 9ab772ac74ae..5abbc3f07dd6 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
@@ -698,6 +698,10 @@ int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata, | |||
698 | if (type == sdata->vif.type) | 698 | if (type == sdata->vif.type) |
699 | return 0; | 699 | return 0; |
700 | 700 | ||
701 | /* Setting ad-hoc mode on non-IBSS channel is not supported. */ | ||
702 | if (sdata->local->oper_channel->flags & IEEE80211_CHAN_NO_IBSS) | ||
703 | return -EOPNOTSUPP; | ||
704 | |||
701 | /* | 705 | /* |
702 | * We could, here, on changes between IBSS/STA/MESH modes, | 706 | * We could, here, on changes between IBSS/STA/MESH modes, |
703 | * invoke an MLME function instead that disassociates etc. | 707 | * invoke an MLME function instead that disassociates etc. |