Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3dd3b79a authored by Abhijeet Kolekar's avatar Abhijeet Kolekar Committed by John W. Linville
Browse files

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: default avatarAbhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e91af0af

net/mac80211/wext.c

+8 −0
Original line number Diff line number Diff line
@@ -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: