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/rtlwifi/rtl8192cu | |
| 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/rtlwifi/rtl8192cu')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c index 6e66f04c363f..b6222eedb835 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | |||
| @@ -334,7 +334,7 @@ bool rtl92cu_rx_query_desc(struct ieee80211_hw *hw, | |||
| 334 | rx_status->flag |= RX_FLAG_40MHZ; | 334 | rx_status->flag |= RX_FLAG_40MHZ; |
| 335 | if (GET_RX_DESC_RX_HT(pdesc)) | 335 | if (GET_RX_DESC_RX_HT(pdesc)) |
| 336 | rx_status->flag |= RX_FLAG_HT; | 336 | rx_status->flag |= RX_FLAG_HT; |
| 337 | rx_status->flag |= RX_FLAG_MACTIME_MPDU; | 337 | rx_status->flag |= RX_FLAG_MACTIME_START; |
| 338 | if (stats->decrypted) | 338 | if (stats->decrypted) |
| 339 | rx_status->flag |= RX_FLAG_DECRYPTED; | 339 | rx_status->flag |= RX_FLAG_DECRYPTED; |
| 340 | rx_status->rate_idx = rtlwifi_rate_mapping(hw, | 340 | rx_status->rate_idx = rtlwifi_rate_mapping(hw, |