diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-09-30 14:52:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-09-30 14:52:29 -0400 |
| commit | 8e00f5fbb4ecbc3431fa686cba60cd76a62604af (patch) | |
| tree | 78aa3bdef892dbd1afc8969fc528e529cfc266f7 /drivers/net/wireless/rtlwifi/rtl8192se/def.h | |
| parent | 56fd49e399ce1d82200fad5b8924d4e35a587809 (diff) | |
| parent | 0874073570d9184a169a4ae2abbe8dbcb71878e9 (diff) | |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/wl12xx/main.c
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192se/def.h')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192se/def.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/def.h b/drivers/net/wireless/rtlwifi/rtl8192se/def.h index 68204ea175dd..c6c044816d39 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/def.h +++ b/drivers/net/wireless/rtlwifi/rtl8192se/def.h | |||
| @@ -459,7 +459,7 @@ do { \ | |||
| 459 | #define SET_RX_STATUS__DESC_BUFF_ADDR(__pdesc, __val) \ | 459 | #define SET_RX_STATUS__DESC_BUFF_ADDR(__pdesc, __val) \ |
| 460 | SET_BITS_OFFSET_LE(__pdesc + 24, 0, 32, __val) | 460 | SET_BITS_OFFSET_LE(__pdesc + 24, 0, 32, __val) |
| 461 | 461 | ||
| 462 | #define RX_HAL_IS_CCK_RATE(_pdesc)\ | 462 | #define SE_RX_HAL_IS_CCK_RATE(_pdesc)\ |
| 463 | (GET_RX_STATUS_DESC_RX_MCS(_pdesc) == DESC92_RATE1M || \ | 463 | (GET_RX_STATUS_DESC_RX_MCS(_pdesc) == DESC92_RATE1M || \ |
| 464 | GET_RX_STATUS_DESC_RX_MCS(_pdesc) == DESC92_RATE2M || \ | 464 | GET_RX_STATUS_DESC_RX_MCS(_pdesc) == DESC92_RATE2M || \ |
| 465 | GET_RX_STATUS_DESC_RX_MCS(_pdesc) == DESC92_RATE5_5M ||\ | 465 | GET_RX_STATUS_DESC_RX_MCS(_pdesc) == DESC92_RATE5_5M ||\ |