diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-09-19 14:34:10 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-09-20 14:43:50 -0400 |
| commit | da3ba88a9996cd64c6768bed5727e02da81e2c8d (patch) | |
| tree | ad6b874767b6aa89c6c1e12df63d24026c6fa296 /drivers/net/wireless/rtlwifi/rtl8192se | |
| parent | 87b6d09225506236c58bf407f9b750591a3b3a7b (diff) | |
| download | op-kernel-dev-da3ba88a9996cd64c6768bed5727e02da81e2c8d.zip op-kernel-dev-da3ba88a9996cd64c6768bed5727e02da81e2c8d.tar.gz | |
rtlwifi: Combine instances of RTL_HAL_IS_CCK_RATE macros.
Three drivers, rtl8192ce, rtl8192cu and rtl8192de, use the same macro
to check if a particular rate is in the CCK set. This common code is
relocated to a common header file. A distinct macro used by rtl8192se
with the same name is renamed.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192se')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192se/def.h | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/def.h b/drivers/net/wireless/rtlwifi/rtl8192se/def.h index 68204ea..c6c0448 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/def.h +++ b/drivers/net/wireless/rtlwifi/rtl8192se/def.h @@ -459,7 +459,7 @@ do { \ #define SET_RX_STATUS__DESC_BUFF_ADDR(__pdesc, __val) \ SET_BITS_OFFSET_LE(__pdesc + 24, 0, 32, __val) -#define RX_HAL_IS_CCK_RATE(_pdesc)\ +#define SE_RX_HAL_IS_CCK_RATE(_pdesc)\ (GET_RX_STATUS_DESC_RX_MCS(_pdesc) == DESC92_RATE1M || \ GET_RX_STATUS_DESC_RX_MCS(_pdesc) == DESC92_RATE2M || \ GET_RX_STATUS_DESC_RX_MCS(_pdesc) == DESC92_RATE5_5M ||\ diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c index d9aeae7..ba137da 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c @@ -126,7 +126,7 @@ static void _rtl92se_query_rxphystatus(struct ieee80211_hw *hw, bool in_powersavemode = false; bool is_cck_rate; - is_cck_rate = RX_HAL_IS_CCK_RATE(pdesc); + is_cck_rate = SE_RX_HAL_IS_CCK_RATE(pdesc); pstats->packet_matchbssid = packet_match_bssid; pstats->packet_toself = packet_toself; pstats->is_cck = is_cck_rate; |
