On 7/10/25 14:14, Alex Gavin wrote:
> - Reorders 'HWSIM_ATTR_PAD' to after 'HWSIM_ATTR_FREQ',
> matching order in 'enum hwsim_attrs'
> - Change references from old commands to new names
> - Fixes typos
>
> Signed-off-by: Alex Gavin <alex.gavin@xxxxxxxxxxxxxxx>
> ---
> drivers/net/wireless/virtual/mac80211_hwsim.h | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/wireless/virtual/mac80211_hwsim.h b/drivers/net/wireless/virtual/mac80211_hwsim.h
> index f32fc3a492b0..fa157c883f7f 100644
> --- a/drivers/net/wireless/virtual/mac80211_hwsim.h
> +++ b/drivers/net/wireless/virtual/mac80211_hwsim.h
> @@ -62,7 +62,7 @@ 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, %WSIM_ATTR_TX_INFO_FLAGS,
> + * %HWSIM_ATTR_TX_INFO, %HWSIM_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
> @@ -126,24 +126,24 @@ enum hwsim_commands {
> * space
> * @HWSIM_ATTR_TX_INFO: ieee80211_tx_rate array
> * @HWSIM_ATTR_COOKIE: sk_buff cookie to identify the frame
> - * @HWSIM_ATTR_CHANNELS: u32 attribute used with the %HWSIM_CMD_CREATE_RADIO
> + * @HWSIM_ATTR_CHANNELS: u32 attribute used with the %HWSIM_CMD_NEW_RADIO
> * command giving the number of channels supported by the new radio
> * @HWSIM_ATTR_RADIO_ID: u32 attribute used with %HWSIM_CMD_DESTROY_RADIO
> * only to destroy a radio
> - * @HWSIM_ATTR_REG_HINT_ALPHA2: alpha2 for regulatoro driver hint
> + * @HWSIM_ATTR_REG_HINT_ALPHA2: alpha2 for regulatory driver hint
> * (nla string, length 2)
> * @HWSIM_ATTR_REG_CUSTOM_REG: custom regulatory domain index (u32 attribute)
> * @HWSIM_ATTR_REG_STRICT_REG: request REGULATORY_STRICT_REG (flag attribute)
> * @HWSIM_ATTR_SUPPORT_P2P_DEVICE: support P2P Device virtual interface (flag)
> - * @HWSIM_ATTR_USE_CHANCTX: used with the %HWSIM_CMD_CREATE_RADIO
> + * @HWSIM_ATTR_USE_CHANCTX: used with the %HWSIM_CMD_NEW_RADIO
> * command to force use of channel contexts even when only a
> * single channel is supported
> - * @HWSIM_ATTR_DESTROY_RADIO_ON_CLOSE: used with the %HWSIM_CMD_CREATE_RADIO
> + * @HWSIM_ATTR_DESTROY_RADIO_ON_CLOSE: used with the %HWSIM_CMD_NEW_RADIO
> * command to force radio removal when process that created the radio dies
> * @HWSIM_ATTR_RADIO_NAME: Name of radio, e.g. phy666
> * @HWSIM_ATTR_NO_VIF: Do not create vif (wlanX) when creating radio.
> - * @HWSIM_ATTR_PAD: padding attribute for 64-bit values, ignore
> * @HWSIM_ATTR_FREQ: Frequency at which packet is transmitted or received.
> + * @HWSIM_ATTR_PAD: padding attribute for 64-bit values, ignore
> * @HWSIM_ATTR_TX_INFO_FLAGS: additional flags for corresponding
> * rates of %HWSIM_ATTR_TX_INFO
> * @HWSIM_ATTR_PERM_ADDR: permanent mac address of new radio
> @@ -151,7 +151,7 @@ enum hwsim_commands {
> * @HWSIM_ATTR_CIPHER_SUPPORT: u32 array of supported cipher types
> * @HWSIM_ATTR_MLO_SUPPORT: claim MLO support (exact parameters TBD) for
> * the new radio
> - * @HWSIM_ATTR_PMSR_SUPPORT: nested attribute used with %HWSIM_CMD_CREATE_RADIO
> + * @HWSIM_ATTR_PMSR_SUPPORT: nested attribute used with %HWSIM_CMD_NEW_RADIO
> * to provide peer measurement capabilities. (nl80211_peer_measurement_attrs)
> * @HWSIM_ATTR_PMSR_REQUEST: nested attribute used with %HWSIM_CMD_START_PMSR
> * to provide details about peer measurement request (nl80211_peer_measurement_attrs)
Noticed these in developing some automation. I also noticed that 'hwsim_new_radio_nl()' returns
the radio ID after creation. This results 'HWSIM_CMD_NEW_RADIO' command response setting the
error genl message error code to the new radio's ID.
Both hostap and iwd rely on this behavior for their hwsim test automation, so I imagine the
existing behavior is best left as is?
Best,
Alex
