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

Commit e7aceef4 authored by Johannes Berg's avatar Johannes Berg
Browse files

cfg80211: remove NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL 



There's no driver using this flag and consequently no userspace
application is actually looking at it. As it seems unlikely for
any driver to start using it, remove it and the (very little)
code that used it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent dfa1ad29

include/uapi/linux/nl80211.h

+1 −6
Original line number Diff line number Diff line
@@ -3843,11 +3843,6 @@ enum nl80211_ap_sme_features { 
 * @NL80211_FEATURE_CELL_BASE_REG_HINTS: This driver has been tested

 *	to work properly to suppport receiving regulatory hints from

 *	cellular base stations.

 * @NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL: If this is set, an active

 *	P2P Device (%NL80211_IFTYPE_P2P_DEVICE) requires its own channel

 *	in the interface combinations, even when it's only used for scan

 *	and remain-on-channel. This could be due to, for example, the

 *	remain-on-channel implementation requiring a channel context.

 * @NL80211_FEATURE_SAE: This driver supports simultaneous authentication of

 *	equals (SAE) with user space SME (NL80211_CMD_AUTHENTICATE) in station

 *	mode
@@ -3889,7 +3884,7 @@ enum nl80211_feature_flags { 
	NL80211_FEATURE_HT_IBSS				= 1 << 1,

	NL80211_FEATURE_INACTIVITY_TIMER		= 1 << 2,

	NL80211_FEATURE_CELL_BASE_REG_HINTS		= 1 << 3,

	NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL	= 1 << 4,

	/* bit 4 is reserved - don't use */

	NL80211_FEATURE_SAE				= 1 << 5,

	NL80211_FEATURE_LOW_PRIORITY_SCAN		= 1 << 6,

	NL80211_FEATURE_SCAN_FLUSH			= 1 << 7,

net/wireless/chan.c

+1 −5
Original line number Diff line number Diff line
@@ -705,12 +705,8 @@ cfg80211_get_chan_state(struct wireless_dev *wdev, 
	case NL80211_IFTYPE_MONITOR:

	case NL80211_IFTYPE_AP_VLAN:

	case NL80211_IFTYPE_WDS:

		/* these interface types don't really have a channel */

		return;

	case NL80211_IFTYPE_P2P_DEVICE:

		if (wdev->wiphy->features &

				NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL)

			*chanmode = CHAN_MODE_EXCLUSIVE;

		/* these interface types don't really have a channel */

		return;

	case NL80211_IFTYPE_UNSPECIFIED:

	case NUM_NL80211_IFTYPES: