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

Commit 1bce85cf authored by Helmut Schaa's avatar Helmut Schaa Committed by John W. Linville
Browse files

Revert "rt2x00 : avoid timestamp for monitor injected frame." 



This reverts commit e81e0aef "rt2x00 : avoid
timestamp for monitor injected frame." as it breaks proper timestamp insertion
into probe responses injected by hostapd for example.

Signed-off-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Cc: Benoit PAPILLAULT <benoit.papillault@free.fr>
Cc: Alban Browaeys <prahal@yahoo.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 430df798

drivers/net/wireless/rt2x00/rt2x00queue.c

+3 −6
Original line number Diff line number Diff line
@@ -365,13 +365,10 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry, 


	/*

	 * Beacons and probe responses require the tsf timestamp

	 * to be inserted into the frame, except for a frame that has been injected

	 * through a monitor interface. This latter is needed for testing a

	 * monitor interface.

	 * to be inserted into the frame.

	 */

	if ((ieee80211_is_beacon(hdr->frame_control) ||

	    ieee80211_is_probe_resp(hdr->frame_control)) &&

	    (!(tx_info->flags & IEEE80211_TX_CTL_INJECTED)))

	if (ieee80211_is_beacon(hdr->frame_control) ||

	    ieee80211_is_probe_resp(hdr->frame_control))

		__set_bit(ENTRY_TXD_REQ_TIMESTAMP, &txdesc->flags);



	/*