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

Commit 18e5ca65 authored by Jukka Rissanen's avatar Jukka Rissanen Committed by Johannes Berg
Browse files

nl80211: Replace interface socket owner attribute with more generic one 



Replace NL80211_ATTR_IFACE_SOCKET_OWNER attribute with more generic
NL80211_ATTR_SOCKET_OWNER that can be used with other commands
that interface creation.

Signed-off-by: default avatarJukka Rissanen <jukka.rissanen@linux.intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 6b67e01f

include/uapi/linux/nl80211.h

+4 −3
Original line number Diff line number Diff line
@@ -1652,9 +1652,9 @@ enum nl80211_commands { 
 * @NL80211_ATTR_TDLS_PEER_CAPABILITY: flags for TDLS peer capabilities, u32.

 *	As specified in the &enum nl80211_tdls_peer_capability.

 *

 * @NL80211_ATTR_IFACE_SOCKET_OWNER: flag attribute, if set during interface

 * @NL80211_ATTR_SOCKET_OWNER: Flag attribute, if set during interface

 *	creation then the new interface will be owned by the netlink socket

 *	that created it and will be destroyed when the socket is closed

 *	that created it and will be destroyed when the socket is closed.

 *

 * @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is

 *	the TDLS link initiator.
@@ -2024,7 +2024,7 @@ enum nl80211_attrs { 


	NL80211_ATTR_TDLS_PEER_CAPABILITY,



	NL80211_ATTR_IFACE_SOCKET_OWNER,

	NL80211_ATTR_SOCKET_OWNER,



	NL80211_ATTR_CSA_C_OFFSETS_TX,

	NL80211_ATTR_MAX_CSA_COUNTERS,
@@ -2055,6 +2055,7 @@ enum nl80211_attrs { 
/* source-level API compatibility */

#define NL80211_ATTR_SCAN_GENERATION NL80211_ATTR_GENERATION

#define	NL80211_ATTR_MESH_PARAMS NL80211_ATTR_MESH_CONFIG

#define NL80211_ATTR_IFACE_SOCKET_OWNER NL80211_ATTR_SOCKET_OWNER



/*

 * Allow user space programs to use #ifdef on new attributes by defining them

net/wireless/nl80211.c

+2 −2
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { 
	[NL80211_ATTR_MAC_HINT] = { .len = ETH_ALEN },

	[NL80211_ATTR_WIPHY_FREQ_HINT] = { .type = NLA_U32 },

	[NL80211_ATTR_TDLS_PEER_CAPABILITY] = { .type = NLA_U32 },

	[NL80211_ATTR_IFACE_SOCKET_OWNER] = { .type = NLA_FLAG },

	[NL80211_ATTR_SOCKET_OWNER] = { .type = NLA_FLAG },

	[NL80211_ATTR_CSA_C_OFFSETS_TX] = { .type = NLA_BINARY },

	[NL80211_ATTR_USE_RRM] = { .type = NLA_FLAG },

	[NL80211_ATTR_TSID] = { .type = NLA_U8 },
@@ -2653,7 +2653,7 @@ static int nl80211_new_interface(struct sk_buff *skb, struct genl_info *info) 
		return PTR_ERR(wdev);

	}



	if (info->attrs[NL80211_ATTR_IFACE_SOCKET_OWNER])

	if (info->attrs[NL80211_ATTR_SOCKET_OWNER])

		wdev->owner_nlportid = info->snd_portid;



	switch (type) {