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

Commit 19468413 authored by Simon Wunderlich's avatar Simon Wunderlich Committed by John W. Linville
Browse files

mac80211: add support for mcs masks 



* Handle MCS masks set by the user.
* Match rates provided by the rate control algorithm to the mask set,
  also in HT mode, and switch back to legacy mode if necessary.
* add debugfs files to observate the rate selection

Signed-off-by: default avatarSimon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: default avatarMathias Kretschmer <mathias.kretschmer@fokus.fraunhofer.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 24db78c0

include/net/mac80211.h

+1 −0
Original line number Diff line number Diff line
@@ -3551,6 +3551,7 @@ struct ieee80211_tx_rate_control { 
	bool rts, short_preamble;

	u8 max_rate_idx;

	u32 rate_idx_mask;

	u8 rate_idx_mcs_mask[IEEE80211_HT_MCS_MASK_LEN];

	bool bss;

};

net/mac80211/cfg.c

+4 −1
Original line number Diff line number Diff line
@@ -1902,8 +1902,11 @@ static int ieee80211_set_bitrate_mask(struct wiphy *wiphy, 
			return ret;

	}



	for (i = 0; i < IEEE80211_NUM_BANDS; i++)

	for (i = 0; i < IEEE80211_NUM_BANDS; i++) {

		sdata->rc_rateidx_mask[i] = mask->control[i].legacy;

		memcpy(sdata->rc_rateidx_mcs_mask[i], mask->control[i].mcs,

		       sizeof(mask->control[i].mcs));

	}



	return 0;

}

net/mac80211/debugfs_netdev.c

+34 −0
Original line number Diff line number Diff line
@@ -87,6 +87,21 @@ static ssize_t ieee80211_if_fmt_##name( \ 
#define IEEE80211_IF_FMT_SIZE(name, field)				\

		IEEE80211_IF_FMT(name, field, "%zd\n")



#define IEEE80211_IF_FMT_HEXARRAY(name, field)				\

static ssize_t ieee80211_if_fmt_##name(					\

	const struct ieee80211_sub_if_data *sdata,			\

	char *buf, int buflen)						\

{									\

	char *p = buf;							\

	int i;								\

	for (i = 0; i < sizeof(sdata->field); i++) {			\

		p += scnprintf(p, buflen + buf - p, "%.2x ",		\

				 sdata->field[i]);			\

	}								\

	p += scnprintf(p, buflen + buf - p, "\n");			\

	return p - buf;							\

}



#define IEEE80211_IF_FMT_ATOMIC(name, field)				\

static ssize_t ieee80211_if_fmt_##name(					\

	const struct ieee80211_sub_if_data *sdata,			\
@@ -148,6 +163,11 @@ IEEE80211_IF_FILE(rc_rateidx_mask_2ghz, rc_rateidx_mask[IEEE80211_BAND_2GHZ], 
		  HEX);

IEEE80211_IF_FILE(rc_rateidx_mask_5ghz, rc_rateidx_mask[IEEE80211_BAND_5GHZ],

		  HEX);

IEEE80211_IF_FILE(rc_rateidx_mcs_mask_2ghz,

		  rc_rateidx_mcs_mask[IEEE80211_BAND_2GHZ], HEXARRAY);

IEEE80211_IF_FILE(rc_rateidx_mcs_mask_5ghz,

		  rc_rateidx_mcs_mask[IEEE80211_BAND_5GHZ], HEXARRAY);



IEEE80211_IF_FILE(flags, flags, HEX);

IEEE80211_IF_FILE(state, state, LHEX);

IEEE80211_IF_FILE(channel_type, vif.bss_conf.channel_type, DEC);
@@ -442,6 +462,8 @@ static void add_sta_files(struct ieee80211_sub_if_data *sdata) 
	DEBUGFS_ADD(channel_type);

	DEBUGFS_ADD(rc_rateidx_mask_2ghz);

	DEBUGFS_ADD(rc_rateidx_mask_5ghz);

	DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);

	DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz);



	DEBUGFS_ADD(bssid);

	DEBUGFS_ADD(aid);
@@ -459,6 +481,8 @@ static void add_ap_files(struct ieee80211_sub_if_data *sdata) 
	DEBUGFS_ADD(channel_type);

	DEBUGFS_ADD(rc_rateidx_mask_2ghz);

	DEBUGFS_ADD(rc_rateidx_mask_5ghz);

	DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);

	DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz);



	DEBUGFS_ADD(num_sta_authorized);

	DEBUGFS_ADD(num_sta_ps);
@@ -469,6 +493,12 @@ static void add_ap_files(struct ieee80211_sub_if_data *sdata) 


static void add_ibss_files(struct ieee80211_sub_if_data *sdata)

{

	DEBUGFS_ADD(channel_type);

	DEBUGFS_ADD(rc_rateidx_mask_2ghz);

	DEBUGFS_ADD(rc_rateidx_mask_5ghz);

	DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);

	DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz);



	DEBUGFS_ADD_MODE(tsf, 0600);

}
@@ -480,6 +510,8 @@ static void add_wds_files(struct ieee80211_sub_if_data *sdata) 
	DEBUGFS_ADD(channel_type);

	DEBUGFS_ADD(rc_rateidx_mask_2ghz);

	DEBUGFS_ADD(rc_rateidx_mask_5ghz);

	DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);

	DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz);



	DEBUGFS_ADD(peer);

}
@@ -492,6 +524,8 @@ static void add_vlan_files(struct ieee80211_sub_if_data *sdata) 
	DEBUGFS_ADD(channel_type);

	DEBUGFS_ADD(rc_rateidx_mask_2ghz);

	DEBUGFS_ADD(rc_rateidx_mask_5ghz);

	DEBUGFS_ADD(rc_rateidx_mcs_mask_2ghz);

	DEBUGFS_ADD(rc_rateidx_mcs_mask_5ghz);

}



static void add_monitor_files(struct ieee80211_sub_if_data *sdata)

net/mac80211/ieee80211_i.h

+1 −0
Original line number Diff line number Diff line
@@ -646,6 +646,7 @@ struct ieee80211_sub_if_data { 


	/* bitmap of allowed (non-MCS) rate indexes for rate control */

	u32 rc_rateidx_mask[IEEE80211_NUM_BANDS];

	u8  rc_rateidx_mcs_mask[IEEE80211_NUM_BANDS][IEEE80211_HT_MCS_MASK_LEN];



	union {

		struct ieee80211_if_ap ap;

net/mac80211/iface.c

+7 −0
Original line number Diff line number Diff line
@@ -1181,6 +1181,13 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, 
		sband = local->hw.wiphy->bands[i];

		sdata->rc_rateidx_mask[i] =

			sband ? (1 << sband->n_bitrates) - 1 : 0;

		if (sband)

			memcpy(sdata->rc_rateidx_mcs_mask[i],

			       sband->ht_cap.mcs.rx_mask,

			       sizeof(sdata->rc_rateidx_mcs_mask[i]));

		else

			memset(sdata->rc_rateidx_mcs_mask[i], 0,

			       sizeof(sdata->rc_rateidx_mcs_mask[i]));

	}



	/* setup type-dependent data */