diff options
| author | Abhijeet Kolekar <abhijeet.kolekar@intel.com> | 2008-11-20 10:20:31 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-11-25 16:13:08 -0500 |
| commit | 3dd3b79aeadc6f6abc5cc78724d7df3dfcc1bd0b (patch) | |
| tree | 831eabe86c67c079f1cae81338530e43429009e5 /net/mac80211 | |
| parent | e91af0af8677198346d5d29f09ab39bb3b0e3faf (diff) | |
| download | kernel_samsung_smdk4412-3dd3b79aeadc6f6abc5cc78724d7df3dfcc1bd0b.zip kernel_samsung_smdk4412-3dd3b79aeadc6f6abc5cc78724d7df3dfcc1bd0b.tar.gz kernel_samsung_smdk4412-3dd3b79aeadc6f6abc5cc78724d7df3dfcc1bd0b.tar.bz2 | |
mac80211 : Fix setting ad-hoc mode and non-ibss channel
Patch fixes the kernel trace when user tries to set
ad-hoc mode on non IBSS channel.
e.g iwconfig wlan0 chan 36 mode ad-hoc
Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/wext.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/mac80211/wext.c b/net/mac80211/wext.c index 742f811..ab4ddba 100644 --- a/net/mac80211/wext.c +++ b/net/mac80211/wext.c @@ -271,6 +271,7 @@ static int ieee80211_ioctl_siwmode(struct net_device *dev, __u32 *mode, char *extra) { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_local *local = sdata->local; int type; if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) @@ -281,6 +282,13 @@ static int ieee80211_ioctl_siwmode(struct net_device *dev, type = NL80211_IFTYPE_STATION; break; case IW_MODE_ADHOC: + /* Setting ad-hoc mode on non ibss channel is not + * supported. + */ + if (local->oper_channel && + (local->oper_channel->flags & IEEE80211_CHAN_NO_IBSS)) + return -EOPNOTSUPP; + type = NL80211_IFTYPE_ADHOC; break; case IW_MODE_REPEAT: |