---

yaml
---
r: 237455
b: refs/heads/master
c: 1bce85c
h: refs/heads/master
i:
  237453: 0ed78c8
  237451: 7597447
  237447: 53f7246
  237439: 68667e5
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 430df7980ef1a522ad2fd1d06e1b6655f2d9320f
+refs/heads/master: 1bce85cf9cea85f6b9a27326effef1e05f7cbc23

trunk/drivers/net/wireless/rt2x00/rt2x00queue.c

@@ -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);
 
 	/*