diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-21 14:43:51 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-21 14:43:51 -0500 |
| commit | 75c8ec71fb29ed59c4b9bda2f411ed3b09164cf7 (patch) | |
| tree | c1dfd91e624b48ccefa71db573d043b639fe088f /drivers/net/wireless/iwlwifi/dvm/rx.c | |
| parent | 1e60896fe07307baa5f3ca1a220dfa9792657352 (diff) | |
| parent | 77d2ece6fde80631193054edc9c9a3edad519565 (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/rx.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/rx.c b/drivers/net/wireless/iwlwifi/dvm/rx.c index 9a8d5020774e..f95b96c47cc4 100644 --- a/drivers/net/wireless/iwlwifi/dvm/rx.c +++ b/drivers/net/wireless/iwlwifi/dvm/rx.c | |||
| @@ -949,7 +949,7 @@ static int iwlagn_rx_reply_rx(struct iwl_priv *priv, | |||
| 949 | 949 | ||
| 950 | /* TSF isn't reliable. In order to allow smooth user experience, | 950 | /* TSF isn't reliable. In order to allow smooth user experience, |
| 951 | * this W/A doesn't propagate it to the mac80211 */ | 951 | * this W/A doesn't propagate it to the mac80211 */ |
| 952 | /*rx_status.flag |= RX_FLAG_MACTIME_MPDU;*/ | 952 | /*rx_status.flag |= RX_FLAG_MACTIME_START;*/ |
| 953 | 953 | ||
| 954 | priv->ucode_beacon_time = le32_to_cpu(phy_res->beacon_time_stamp); | 954 | priv->ucode_beacon_time = le32_to_cpu(phy_res->beacon_time_stamp); |
| 955 | 955 | ||