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

Commit 4e13f092 authored by Ashok Nagarajan's avatar Ashok Nagarajan Committed by John W. Linville
Browse files

mac80211_hwsim: Fix set mactime on receiver hwsim radio 



The patch "mac80211_hwsim:  Add tsf to beacons, probe responses and radiotap
header" was setting the mactime on wrong hwsim radio. This patch fixes it.

Signed-off-by: default avatarAshok Nagarajan <ashok@cozybit.com>
Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent aa454580

drivers/net/wireless/mac80211_hwsim.c

+2 −1
Original line number Diff line number Diff line
@@ -639,7 +639,6 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw, 
	}



	memset(&rx_status, 0, sizeof(rx_status));

	rx_status.mactime = le64_to_cpu(__mac80211_hwsim_get_tsf(data));

	rx_status.flag |= RX_FLAG_MACTIME_MPDU;

	rx_status.freq = data->channel->center_freq;

	rx_status.band = data->channel->band;
@@ -684,6 +683,8 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw, 


		if (mac80211_hwsim_addr_match(data2, hdr->addr1))

			ack = true;

		rx_status.mactime =

			le64_to_cpu(__mac80211_hwsim_get_tsf(data2));

		memcpy(IEEE80211_SKB_RXCB(nskb), &rx_status, sizeof(rx_status));

		ieee80211_rx_irqsafe(data2->hw, nskb);

	}