diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-08 19:59:05 -0400 |
| commit | 17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b (patch) | |
| tree | 88bb1fcf84f9ebfa4299c9a8dcd9e6330b358446 /drivers/net/wireless/iwlwifi/iwl-rx.c | |
| parent | 712d6954e3998d0de2840d8130941e8042541246 (diff) | |
| parent | 82a28c794f27aac17d7a3ebd7f14d731a11a5532 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-rx.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-rx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c index b92a580ed2f9..faad4d3f56e1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c | |||
| @@ -1068,7 +1068,10 @@ void iwl_rx_reply_rx(struct iwl_priv *priv, | |||
| 1068 | rx_status.rate_idx -= IWL_FIRST_OFDM_RATE; | 1068 | rx_status.rate_idx -= IWL_FIRST_OFDM_RATE; |
| 1069 | 1069 | ||
| 1070 | rx_status.flag = 0; | 1070 | rx_status.flag = 0; |
| 1071 | rx_status.flag |= RX_FLAG_TSFT; | 1071 | |
| 1072 | /* TSF isn't reliable. In order to allow smooth user experience, | ||
| 1073 | * this W/A doesn't propagate it to the mac80211 */ | ||
| 1074 | /*rx_status.flag |= RX_FLAG_TSFT;*/ | ||
| 1072 | 1075 | ||
| 1073 | if ((unlikely(rx_start->cfg_phy_cnt > 20))) { | 1076 | if ((unlikely(rx_start->cfg_phy_cnt > 20))) { |
| 1074 | IWL_DEBUG_DROP("dsp size out of range [0,20]: %d/n", | 1077 | IWL_DEBUG_DROP("dsp size out of range [0,20]: %d/n", |