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

Commit bb6e753e authored by Helmut Schaa's avatar Helmut Schaa Committed by John W. Linville
Browse files

nl80211: Add sta_flags to the station info 



Reuse the already existing struct nl80211_sta_flag_update to specify
both, a flag mask and the flag set itself. This means
nl80211_sta_flag_update is now used for setting station flags and also
for getting station flags.

Signed-off-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 59b66255

include/linux/nl80211.h

+2 −0
Original line number Diff line number Diff line
@@ -1548,6 +1548,7 @@ enum nl80211_sta_bss_param { 
 * @NL80211_STA_INFO_BSS_PARAM: current station's view of BSS, nested attribute

 *     containing info as possible, see &enum nl80211_sta_bss_param

 * @NL80211_STA_INFO_CONNECTED_TIME: time since the station is last connected

 * @NL80211_STA_INFO_STA_FLAGS: Contains a struct nl80211_sta_flag_update.

 * @__NL80211_STA_INFO_AFTER_LAST: internal

 * @NL80211_STA_INFO_MAX: highest possible station info attribute

 */
@@ -1569,6 +1570,7 @@ enum nl80211_sta_info { 
	NL80211_STA_INFO_RX_BITRATE,

	NL80211_STA_INFO_BSS_PARAM,

	NL80211_STA_INFO_CONNECTED_TIME,

	NL80211_STA_INFO_STA_FLAGS,



	/* keep last */

	__NL80211_STA_INFO_AFTER_LAST,

include/net/cfg80211.h

+4 −1
Original line number Diff line number Diff line
@@ -497,6 +497,7 @@ struct station_parameters { 
 * @STATION_INFO_BSS_PARAM: @bss_param filled

 * @STATION_INFO_CONNECTED_TIME: @connected_time filled

 * @STATION_INFO_ASSOC_REQ_IES: @assoc_req_ies filled

 * @STATION_INFO_STA_FLAGS: @sta_flags filled

 */

enum station_info_flags {

	STATION_INFO_INACTIVE_TIME	= 1<<0,
@@ -516,7 +517,8 @@ enum station_info_flags { 
	STATION_INFO_RX_BITRATE		= 1<<14,

	STATION_INFO_BSS_PARAM          = 1<<15,

	STATION_INFO_CONNECTED_TIME	= 1<<16,

	STATION_INFO_ASSOC_REQ_IES	= 1<<17

	STATION_INFO_ASSOC_REQ_IES	= 1<<17,

	STATION_INFO_STA_FLAGS		= 1<<18

};



/**
@@ -633,6 +635,7 @@ struct station_info { 
	u32 tx_failed;

	u32 rx_dropped_misc;

	struct sta_bss_parameters bss_param;

	struct nl80211_sta_flag_update sta_flags;



	int generation;

net/wireless/nl80211.c

+4 −0
Original line number Diff line number Diff line
@@ -2344,6 +2344,10 @@ static int nl80211_send_station(struct sk_buff *msg, u32 pid, u32 seq, 


		nla_nest_end(msg, bss_param);

	}

	if (sinfo->filled & STATION_INFO_STA_FLAGS)

		NLA_PUT(msg, NL80211_STA_INFO_STA_FLAGS,

			sizeof(struct nl80211_sta_flag_update),

			&sinfo->sta_flags);

	nla_nest_end(msg, sinfoattr);



	if (sinfo->filled & STATION_INFO_ASSOC_REQ_IES)