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

Commit 8b94148c authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Johannes Berg
Browse files

mac80211: expose TDLS-initiator value to low level driver 



Some drivers need to know which station is the TDLS link initiator.
Expose this value via the mac80211 ieee80211_sta structure.

Signed-off-by: default avatarArik Nemtsov <arikx.nemtsov@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 452218d9

include/net/mac80211.h

+3 −0
Original line number Diff line number Diff line
@@ -1427,6 +1427,8 @@ struct ieee80211_sta_rates { 
 * @smps_mode: current SMPS mode (off, static or dynamic)

 * @rates: rate control selection table

 * @tdls: indicates whether the STA is a TDLS peer

 * @tdls_initiator: indicates the STA is an initiator of the TDLS link. Only

 *	valid if the STA is a TDLS peer in the first place.

 */

struct ieee80211_sta {

	u32 supp_rates[IEEE80211_NUM_BANDS];
@@ -1442,6 +1444,7 @@ struct ieee80211_sta { 
	enum ieee80211_smps_mode smps_mode;

	struct ieee80211_sta_rates __rcu *rates;

	bool tdls;

	bool tdls_initiator;



	/* must be last */

	u8 drv_priv[0] __aligned(sizeof(void *));

net/mac80211/tdls.c

+6 −2
Original line number Diff line number Diff line
@@ -562,8 +562,10 @@ ieee80211_tdls_prep_mgmt_packet(struct wiphy *wiphy, struct net_device *dev, 
	/* infer the initiator if we can, to support old userspace */

	switch (action_code) {

	case WLAN_TDLS_SETUP_REQUEST:

		if (sta)

		if (sta) {

			set_sta_flag(sta, WLAN_STA_TDLS_INITIATOR);

			sta->sta.tdls_initiator = false;

		}

		/* fall-through */

	case WLAN_TDLS_SETUP_CONFIRM:

	case WLAN_TDLS_DISCOVERY_REQUEST:
@@ -575,8 +577,10 @@ ieee80211_tdls_prep_mgmt_packet(struct wiphy *wiphy, struct net_device *dev, 
		 * Make the last packet sent take effect for the initiator

		 * value.

		 */

		if (sta)

		if (sta) {

			clear_sta_flag(sta, WLAN_STA_TDLS_INITIATOR);

			sta->sta.tdls_initiator = true;

		}

		/* fall-through */

	case WLAN_PUB_ACTION_TDLS_DISCOVER_RES:

		initiator = false;