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

Commit 6e3d6ca1 authored by Benjamin Beichler's avatar Benjamin Beichler Committed by Johannes Berg
Browse files

mac80211_hwsim: add hwsim_tx_rate_flags to netlink attributes 



For correct interpretation of a tx rate, the corresponding rate flags are
needed (e.g. whether a HT-MCS rate or a legacy rate) and moreover for more
correct simulation the other infos of the flags are important (like
short-GI). Keeping compatibility, the flags are not integrated into the
existing hwsim_tx_rate, but transmitted as an additional netlink attribute.

Signed-off-by: default avatarBenjamin Beichler <benjamin.beichler@uni-rostock.de>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent c6509cc3

drivers/net/wireless/mac80211_hwsim.c

+40 −1
Original line number Diff line number Diff line
@@ -1018,6 +1018,36 @@ static int hwsim_unicast_netgroup(struct mac80211_hwsim_data *data, 
	return res;

}



static inline u16 trans_tx_rate_flags_ieee2hwsim(struct ieee80211_tx_rate *rate)

{

	u16 result = 0;



	if (rate->flags & IEEE80211_TX_RC_USE_RTS_CTS)

		result |= MAC80211_HWSIM_TX_RC_USE_RTS_CTS;

	if (rate->flags & IEEE80211_TX_RC_USE_CTS_PROTECT)

		result |= MAC80211_HWSIM_TX_RC_USE_CTS_PROTECT;

	if (rate->flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE)

		result |= MAC80211_HWSIM_TX_RC_USE_SHORT_PREAMBLE;

	if (rate->flags & IEEE80211_TX_RC_MCS)

		result |= MAC80211_HWSIM_TX_RC_MCS;

	if (rate->flags & IEEE80211_TX_RC_GREEN_FIELD)

		result |= MAC80211_HWSIM_TX_RC_GREEN_FIELD;

	if (rate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH)

		result |= MAC80211_HWSIM_TX_RC_40_MHZ_WIDTH;

	if (rate->flags & IEEE80211_TX_RC_DUP_DATA)

		result |= MAC80211_HWSIM_TX_RC_DUP_DATA;

	if (rate->flags & IEEE80211_TX_RC_SHORT_GI)

		result |= MAC80211_HWSIM_TX_RC_SHORT_GI;

	if (rate->flags & IEEE80211_TX_RC_VHT_MCS)

		result |= MAC80211_HWSIM_TX_RC_VHT_MCS;

	if (rate->flags & IEEE80211_TX_RC_80_MHZ_WIDTH)

		result |= MAC80211_HWSIM_TX_RC_80_MHZ_WIDTH;

	if (rate->flags & IEEE80211_TX_RC_160_MHZ_WIDTH)

		result |= MAC80211_HWSIM_TX_RC_160_MHZ_WIDTH;



	return result;

}



static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,

				       struct sk_buff *my_skb,

				       int dst_portid)
@@ -1030,6 +1060,7 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw, 
	unsigned int hwsim_flags = 0;

	int i;

	struct hwsim_tx_rate tx_attempts[IEEE80211_TX_MAX_RATES];

	struct hwsim_tx_rate_flag tx_attempts_flags[IEEE80211_TX_MAX_RATES];

	uintptr_t cookie;



	if (data->ps != PS_DISABLED)
@@ -1081,7 +1112,11 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw, 


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

		tx_attempts[i].idx = info->status.rates[i].idx;

		tx_attempts_flags[i].idx = info->status.rates[i].idx;

		tx_attempts[i].count = info->status.rates[i].count;

		tx_attempts_flags[i].flags =

				trans_tx_rate_flags_ieee2hwsim(

						&info->status.rates[i]);

	}



	if (nla_put(skb, HWSIM_ATTR_TX_INFO,
@@ -1089,6 +1124,11 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw, 
		    tx_attempts))

		goto nla_put_failure;



	if (nla_put(skb, HWSIM_ATTR_TX_INFO_FLAGS,

		    sizeof(struct hwsim_tx_rate_flag) * IEEE80211_TX_MAX_RATES,

		    tx_attempts_flags))

		goto nla_put_failure;



	/* We create a cookie to identify this skb */

	data->pending_cookie++;

	cookie = data->pending_cookie;
@@ -2983,7 +3023,6 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2, 
	for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {

		txi->status.rates[i].idx = tx_attempts[i].idx;

		txi->status.rates[i].count = tx_attempts[i].count;

		/*txi->status.rates[i].flags = 0;*/

	}



	txi->status.ack_signal = nla_get_u32(info->attrs[HWSIM_ATTR_SIGNAL]);

drivers/net/wireless/mac80211_hwsim.h

+67 −1
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ enum hwsim_tx_control_flags { 
 * @HWSIM_CMD_TX_INFO_FRAME: Transmission info report from user space to

 *	kernel, uses:

 *	%HWSIM_ATTR_ADDR_TRANSMITTER, %HWSIM_ATTR_FLAGS,

 *	%HWSIM_ATTR_TX_INFO, %HWSIM_ATTR_SIGNAL, %HWSIM_ATTR_COOKIE

 *	%HWSIM_ATTR_TX_INFO, %WSIM_ATTR_TX_INFO_FLAGS,

 *	%HWSIM_ATTR_SIGNAL, %HWSIM_ATTR_COOKIE

 * @HWSIM_CMD_NEW_RADIO: create a new radio with the given parameters,

 *	returns the radio ID (>= 0) or negative on errors, if successful

 *	then multicast the result
@@ -123,6 +124,8 @@ enum { 
 * @HWSIM_ATTR_RADIO_NAME: Name of radio, e.g. phy666

 * @HWSIM_ATTR_NO_VIF:  Do not create vif (wlanX) when creating radio.

 * @HWSIM_ATTR_FREQ: Frequency at which packet is transmitted or received.

 * @HWSIM_ATTR_TX_INFO_FLAGS: additional flags for corresponding

 *	rates of %HWSIM_ATTR_TX_INFO

 * @__HWSIM_ATTR_MAX: enum limit

 */
@@ -149,6 +152,7 @@ enum { 
	HWSIM_ATTR_NO_VIF,

	HWSIM_ATTR_FREQ,

	HWSIM_ATTR_PAD,

	HWSIM_ATTR_TX_INFO_FLAGS,

	__HWSIM_ATTR_MAX,

};

#define HWSIM_ATTR_MAX (__HWSIM_ATTR_MAX - 1)
@@ -171,4 +175,66 @@ struct hwsim_tx_rate { 
	u8 count;

} __packed;



/**

 * enum hwsim_tx_rate_flags - per-rate flags set by the rate control algorithm.

 *	Inspired by structure mac80211_rate_control_flags. New flags may be

 *	appended, but old flags not deleted, to keep compatibility for

 *	userspace.

 *

 * These flags are set by the Rate control algorithm for each rate during tx,

 * in the @flags member of struct ieee80211_tx_rate.

 *

 * @MAC80211_HWSIM_TX_RC_USE_RTS_CTS: Use RTS/CTS exchange for this rate.

 * @MAC80211_HWSIM_TX_RC_USE_CTS_PROTECT: CTS-to-self protection is required.

 *	This is set if the current BSS requires ERP protection.

 * @MAC80211_HWSIM_TX_RC_USE_SHORT_PREAMBLE: Use short preamble.

 * @MAC80211_HWSIM_TX_RC_MCS: HT rate.

 * @MAC80211_HWSIM_TX_RC_VHT_MCS: VHT MCS rate, in this case the idx field is

 *	split into a higher 4 bits (Nss) and lower 4 bits (MCS number)

 * @MAC80211_HWSIM_TX_RC_GREEN_FIELD: Indicates whether this rate should be used

 *	in Greenfield mode.

 * @MAC80211_HWSIM_TX_RC_40_MHZ_WIDTH: Indicates if the Channel Width should be

 *	40 MHz.

 * @MAC80211_HWSIM_TX_RC_80_MHZ_WIDTH: Indicates 80 MHz transmission

 * @MAC80211_HWSIM_TX_RC_160_MHZ_WIDTH: Indicates 160 MHz transmission

 *	(80+80 isn't supported yet)

 * @MAC80211_HWSIM_TX_RC_DUP_DATA: The frame should be transmitted on both of

 *	the adjacent 20 MHz channels, if the current channel type is

 *	NL80211_CHAN_HT40MINUS or NL80211_CHAN_HT40PLUS.

 * @MAC80211_HWSIM_TX_RC_SHORT_GI: Short Guard interval should be used for this

 *	rate.

 */

enum hwsim_tx_rate_flags {

	MAC80211_HWSIM_TX_RC_USE_RTS_CTS		= BIT(0),

	MAC80211_HWSIM_TX_RC_USE_CTS_PROTECT		= BIT(1),

	MAC80211_HWSIM_TX_RC_USE_SHORT_PREAMBLE	= BIT(2),



	/* rate index is an HT/VHT MCS instead of an index */

	MAC80211_HWSIM_TX_RC_MCS			= BIT(3),

	MAC80211_HWSIM_TX_RC_GREEN_FIELD		= BIT(4),

	MAC80211_HWSIM_TX_RC_40_MHZ_WIDTH		= BIT(5),

	MAC80211_HWSIM_TX_RC_DUP_DATA		= BIT(6),

	MAC80211_HWSIM_TX_RC_SHORT_GI		= BIT(7),

	MAC80211_HWSIM_TX_RC_VHT_MCS			= BIT(8),

	MAC80211_HWSIM_TX_RC_80_MHZ_WIDTH		= BIT(9),

	MAC80211_HWSIM_TX_RC_160_MHZ_WIDTH		= BIT(10),

};



/**

 * struct hwsim_tx_rate - rate selection/status

 *

 * @idx: rate index to attempt to send with

 * @count: number of tries in this rate before going to the next rate

 *

 * A value of -1 for @idx indicates an invalid rate and, if used

 * in an array of retry rates, that no more rates should be tried.

 *

 * When used for transmit status reporting, the driver should

 * always report the rate and number of retries used.

 *

 */

struct hwsim_tx_rate_flag {

	s8 idx;

	u16 flags;

} __packed;

#endif /* __MAC80211_HWSIM_H */