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

Commit 10b43e84 authored by Gautam Kumar Shukla's avatar Gautam Kumar Shukla Committed by Gerrit - the friendly Code Review server
Browse files

cfg80211: add extensible feature flag attribute 



With the wiphy::features flag being used up this patch adds a
new field wiphy::ext_features. Considering extensibility this
new field is declared as a byte array. This extensible flag is
exposed to user-space by NL80211_ATTR_EXT_FEATURES.

Cc: Avinash Patil <patila@marvell.com>
Signed-off-by: default avatarGautam (Gautam Kumar) Shukla <gautams@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Git-commit: d75bb06b61cb69ee6223d791d3bb230e68623b20
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git


CRs-fixed: 1096202
Change-Id: Ib76b94b53b73e8b7a2755b0612d8ed3f860852b0
[pkushwah@codeaurora.org: changes in include/uapi/linux/nl80211.h were
already included to retain enum ordering for msm-3.18.]
Signed-off-by: default avatarPurushottam Kushwaha <pkushwah@codeaurora.org>
parent 623814b0

include/net/cfg80211.h

+39 −0
Original line number Diff line number Diff line
@@ -3084,6 +3084,8 @@ struct wiphy_iftype_ext_capab { 
 * @regulatory_flags: wiphy regulatory flags, see

 *	&enum ieee80211_regulatory_flags

 * @features: features advertised to nl80211, see &enum nl80211_feature_flags.

 * @ext_features: extended features advertised to nl80211, see

 *	&enum nl80211_ext_feature_index.

 * @bss_priv_size: each BSS struct has private data allocated with it,

 *	this variable determines its size

 * @max_scan_ssids: maximum number of SSIDs the device can scan for in
@@ -3198,6 +3200,7 @@ struct wiphy { 
	u16 max_acl_mac_addrs;



	u32 flags, regulatory_flags, features;

	u8 ext_features[DIV_ROUND_UP(NUM_NL80211_EXT_FEATURES, 8)];



	u32 ap_sme_capa;
@@ -5181,6 +5184,42 @@ void cfg80211_stop_iface(struct wiphy *wiphy, struct wireless_dev *wdev, 
 */

void cfg80211_shutdown_all_interfaces(struct wiphy *wiphy);



/**

 * wiphy_ext_feature_set - set the extended feature flag

 *

 * @wiphy: the wiphy to modify.

 * @ftidx: extended feature bit index.

 *

 * The extended features are flagged in multiple bytes (see

 * &struct wiphy.@ext_features)

 */

static inline void wiphy_ext_feature_set(struct wiphy *wiphy,

					 enum nl80211_ext_feature_index ftidx)

{

	u8 *ft_byte;



	ft_byte = &wiphy->ext_features[ftidx / 8];

	*ft_byte |= BIT(ftidx % 8);

}



/**

 * wiphy_ext_feature_isset - check the extended feature flag

 *

 * @wiphy: the wiphy to modify.

 * @ftidx: extended feature bit index.

 *

 * The extended features are flagged in multiple bytes (see

 * &struct wiphy.@ext_features)

 */

static inline bool

wiphy_ext_feature_isset(struct wiphy *wiphy,

			enum nl80211_ext_feature_index ftidx)

{

	u8 ft_byte;



	ft_byte = wiphy->ext_features[ftidx / 8];

	return (ft_byte & BIT(ftidx % 8)) != 0;

}



/* ethtool helper */

void cfg80211_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info);

include/uapi/linux/nl80211.h

+13 −0
Original line number Diff line number Diff line
@@ -4257,6 +4257,19 @@ enum nl80211_feature_flags { 
	NL80211_FEATURE_ND_RANDOM_MAC_ADDR		= 1 << 31,

};



/**

 * enum nl80211_ext_feature_index - bit index of extended features.

 *

 * @NUM_NL80211_EXT_FEATURES: number of extended features.

 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.

 */

enum nl80211_ext_feature_index {



	/* add new features before the definition below */

	NUM_NL80211_EXT_FEATURES,

	MAX_NL80211_EXT_FEATURES = NUM_NL80211_EXT_FEATURES - 1

};



/**

 * enum nl80211_probe_resp_offload_support_attr - optional supported

 *	protocols for probe-response offloading by the driver/FW.

net/wireless/nl80211.c

+5 −0
Original line number Diff line number Diff line
@@ -1739,6 +1739,11 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *rdev, 
			}

		}



		if (nla_put(msg, NL80211_ATTR_EXT_FEATURES,

			    sizeof(rdev->wiphy.ext_features),

			    rdev->wiphy.ext_features))

			goto nla_put_failure;



		/* done */

		state->split_start = 0;

		break;