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

Commit 82c0cc90 authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Johannes Berg
Browse files

mac80211: debugfs: add file to disallow TDLS wider-bw 



Sometimes we are interested in testing TDLS performance in a specific
width setting. Add the ability to disable the wider-band feature, thereby
allowing the TDLS channel width to be controlled by the BSS width.

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 fc58c47e

net/mac80211/cfg.c

+1 −0
Original line number Diff line number Diff line
@@ -1156,6 +1156,7 @@ static int sta_apply_parameters(struct ieee80211_local *local, 
		set_sta_flag(sta, WLAN_STA_TDLS_CHAN_SWITCH);



	if (test_sta_flag(sta, WLAN_STA_TDLS_PEER) &&

	    !sdata->u.mgd.tdls_wider_bw_prohibited &&

	    ieee80211_hw_check(&local->hw, TDLS_WIDER_BW) &&

	    params->ext_capab_len >= 8 &&

	    params->ext_capab[7] & WLAN_EXT_CAPA8_TDLS_WIDE_BW_ENABLED)

net/mac80211/debugfs_netdev.c

+29 −0
Original line number Diff line number Diff line
@@ -455,6 +455,34 @@ static ssize_t ieee80211_if_parse_uapsd_max_sp_len( 
}

IEEE80211_IF_FILE_RW(uapsd_max_sp_len);



static ssize_t ieee80211_if_fmt_tdls_wider_bw(

	const struct ieee80211_sub_if_data *sdata, char *buf, int buflen)

{

	const struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;

	bool tdls_wider_bw;



	tdls_wider_bw = ieee80211_hw_check(&sdata->local->hw, TDLS_WIDER_BW) &&

			!ifmgd->tdls_wider_bw_prohibited;



	return snprintf(buf, buflen, "%d\n", tdls_wider_bw);

}



static ssize_t ieee80211_if_parse_tdls_wider_bw(

	struct ieee80211_sub_if_data *sdata, const char *buf, int buflen)

{

	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;

	u8 val;

	int ret;



	ret = kstrtou8(buf, 0, &val);

	if (ret)

		return ret;



	ifmgd->tdls_wider_bw_prohibited = !val;

	return buflen;

}

IEEE80211_IF_FILE_RW(tdls_wider_bw);



/* AP attributes */

IEEE80211_IF_FILE(num_mcast_sta, u.ap.num_mcast_sta, ATOMIC);

IEEE80211_IF_FILE(num_sta_ps, u.ap.ps.num_sta_ps, ATOMIC);
@@ -614,6 +642,7 @@ static void add_sta_files(struct ieee80211_sub_if_data *sdata) 
	DEBUGFS_ADD_MODE(beacon_loss, 0200);

	DEBUGFS_ADD_MODE(uapsd_queues, 0600);

	DEBUGFS_ADD_MODE(uapsd_max_sp_len, 0600);

	DEBUGFS_ADD_MODE(tdls_wider_bw, 0600);

}



static void add_ap_files(struct ieee80211_sub_if_data *sdata)

net/mac80211/ieee80211_i.h

+1 −0
Original line number Diff line number Diff line
@@ -535,6 +535,7 @@ struct ieee80211_if_managed { 
	struct sk_buff *teardown_skb; /* A copy to send through the AP */

	spinlock_t teardown_lock; /* To lock changing teardown_skb */

	bool tdls_chan_switch_prohibited;

	bool tdls_wider_bw_prohibited;



	/* WMM-AC TSPEC support */

	struct ieee80211_sta_tx_tspec tx_tspec[IEEE80211_NUM_ACS];

net/mac80211/tdls.c

+3 −1
Original line number Diff line number Diff line
@@ -41,9 +41,11 @@ static void ieee80211_tdls_add_ext_capab(struct ieee80211_sub_if_data *sdata, 
					 struct sk_buff *skb)

{

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;

	bool chan_switch = local->hw.wiphy->features &

			   NL80211_FEATURE_TDLS_CHANNEL_SWITCH;

	bool wider_band = ieee80211_hw_check(&local->hw, TDLS_WIDER_BW);

	bool wider_band = ieee80211_hw_check(&local->hw, TDLS_WIDER_BW) &&

			  !ifmgd->tdls_wider_bw_prohibited;

	enum ieee80211_band band = ieee80211_get_sdata_band(sdata);

	struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];

	bool vht = sband && sband->vht_cap.vht_supported;