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/iwlegacy | |
| 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/iwlegacy')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/4965-mac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index eac4dc8bc879..ef68b7239955 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c | |||
| @@ -686,7 +686,7 @@ il4965_hdl_rx(struct il_priv *il, struct il_rx_buf *rxb) | |||
| 686 | 686 | ||
| 687 | /* TSF isn't reliable. In order to allow smooth user experience, | 687 | /* TSF isn't reliable. In order to allow smooth user experience, |
| 688 | * this W/A doesn't propagate it to the mac80211 */ | 688 | * this W/A doesn't propagate it to the mac80211 */ |
| 689 | /*rx_status.flag |= RX_FLAG_MACTIME_MPDU; */ | 689 | /*rx_status.flag |= RX_FLAG_MACTIME_START; */ |
| 690 | 690 | ||
| 691 | il->ucode_beacon_time = le32_to_cpu(phy_res->beacon_time_stamp); | 691 | il->ucode_beacon_time = le32_to_cpu(phy_res->beacon_time_stamp); |
| 692 | 692 | ||