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

Commit ffc11991 authored Feb 21, 2015 by Janusz.Dziedzic@tieto.com Committed by Johannes Berg Mar 03, 2015

cfg80211: add VHT support for IBSS



Add NL80211_EXT_FEATURE_VHT_IBSS flag and VHT
support for IBSS.

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 6eb18137

include/uapi/linux/nl80211.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4328,11 +4328,13 @@ enum nl80211_feature_flags {

	/**		/**
	* enum nl80211_ext_feature_index - bit index of extended features.		* enum nl80211_ext_feature_index - bit index of extended features.
			* @NL80211_EXT_FEATURE_VHT_IBSS: This driver supports IBSS with VHT datarates.
	*		*
	* @NUM_NL80211_EXT_FEATURES: number of extended features.		* @NUM_NL80211_EXT_FEATURES: number of extended features.
	* @MAX_NL80211_EXT_FEATURES: highest extended feature index.		* @MAX_NL80211_EXT_FEATURES: highest extended feature index.
	*/		*/
	enum nl80211_ext_feature_index {		enum nl80211_ext_feature_index {
			NL80211_EXT_FEATURE_VHT_IBSS,

	/* add new features before the definition below */		/* add new features before the definition below */
	NUM_NL80211_EXT_FEATURES,		NUM_NL80211_EXT_FEATURES,

net/wireless/nl80211.c

+12 −2

Original line number	Original line	Diff line number	Diff line
	@@ -7265,7 +7265,17 @@ static int nl80211_join_ibss(struct sk_buff skb, struct genl_info info)
	break;		break;
	case NL80211_CHAN_WIDTH_20:		case NL80211_CHAN_WIDTH_20:
	case NL80211_CHAN_WIDTH_40:		case NL80211_CHAN_WIDTH_40:
	if (rdev->wiphy.features & NL80211_FEATURE_HT_IBSS)		if (!(rdev->wiphy.features & NL80211_FEATURE_HT_IBSS))
			return -EINVAL;
			break;
			case NL80211_CHAN_WIDTH_80:
			case NL80211_CHAN_WIDTH_80P80:
			case NL80211_CHAN_WIDTH_160:
			if (!(rdev->wiphy.features & NL80211_FEATURE_HT_IBSS))
			return -EINVAL;
			if (!wiphy_ext_feature_isset(&rdev->wiphy,
			NL80211_EXT_FEATURE_VHT_IBSS))
			return -EINVAL;
	break;		break;
	default:		default:
	return -EINVAL;		return -EINVAL;