mac80211-hwsim: add frequency attribute to netlink pkts (4f86ed8f) · Commits · 戴 / test

drivers/net/wireless/mac80211_hwsim.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -910,6 +910,9 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,
		if (nla_put_u32(skb, HWSIM_ATTR_FLAGS, hwsim_flags))
		goto nla_put_failure;

		if (nla_put_u32(skb, HWSIM_ATTR_FREQ, data->channel->center_freq))
		goto nla_put_failure;

		/* We get the tx control (rate and retries) info*/

		for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
		@@ -2463,6 +2466,9 @@ static int hwsim_cloned_frame_received_nl(struct sk_buff *skb_2,

		/* A frame is received from user space */
		memset(&rx_status, 0, sizeof(rx_status));
		/* TODO: Check ATTR_FREQ if it exists, and maybe throw away off-channel
		* packets?
		*/
		rx_status.freq = data2->channel->center_freq;
		rx_status.band = data2->channel->band;
		rx_status.rate_idx = nla_get_u32(info->attrs[HWSIM_ATTR_RX_RATE]);

+3 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ enum hwsim_tx_control_flags {
		* space, uses:
		* %HWSIM_ATTR_ADDR_TRANSMITTER, %HWSIM_ATTR_ADDR_RECEIVER,
		* %HWSIM_ATTR_FRAME, %HWSIM_ATTR_FLAGS, %HWSIM_ATTR_RX_RATE,
		* %HWSIM_ATTR_SIGNAL, %HWSIM_ATTR_COOKIE
		* %HWSIM_ATTR_SIGNAL, %HWSIM_ATTR_COOKIE, %HWSIM_ATTR_FREQ (optional)
		* @HWSIM_CMD_TX_INFO_FRAME: Transmission info report from user space to
		* kernel, uses:
		* %HWSIM_ATTR_ADDR_TRANSMITTER, %HWSIM_ATTR_FLAGS,
		@@ -119,6 +119,7 @@ enum {
		* 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_FREQ: Frequency at which packet is transmitted or received.
		* @__HWSIM_ATTR_MAX: enum limit
		*/

		@@ -143,6 +144,7 @@ enum {
		HWSIM_ATTR_DESTROY_RADIO_ON_CLOSE,
		HWSIM_ATTR_RADIO_NAME,
		HWSIM_ATTR_NO_VIF,
		HWSIM_ATTR_FREQ,
		__HWSIM_ATTR_MAX,
		};
		#define HWSIM_ATTR_MAX (__HWSIM_ATTR_MAX - 1)