From 19b7bfc8d9c773751d681e2f4a5b2c5b2b4f572d Mon Sep 17 00:00:00 2001 From: Helmut Schaa Date: Sun, 20 Feb 2011 13:56:07 +0100 Subject: [PATCH] --- yaml --- r: 237455 b: refs/heads/master c: 1bce85cf9cea85f6b9a27326effef1e05f7cbc23 h: refs/heads/master i: 237453: 0ed78c832db998d183f0e450dc4d4c391be796d8 237451: 7597447fb2d9f646586085d7e0a2c62500a10268 237447: 53f72469387fa9f9e25456c0adb952458ff52c0d 237439: 68667e58b5220a82a2da36bb96038af79d25c338 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/rt2x00queue.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index be9bd41630b1..6f55f670c713 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 430df7980ef1a522ad2fd1d06e1b6655f2d9320f +refs/heads/master: 1bce85cf9cea85f6b9a27326effef1e05f7cbc23 diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00queue.c b/trunk/drivers/net/wireless/rt2x00/rt2x00queue.c index fa17c83b9685..bf9bba356280 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/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); /*