diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/rtl8192u/r8192U_core.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index 7037ff6..74d2d77 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c @@ -236,12 +236,6 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv *priv) } -#define rx_hal_is_cck_rate(_pdrvinfo)\ - (_pdrvinfo->RxRate == DESC90_RATE1M ||\ - _pdrvinfo->RxRate == DESC90_RATE2M ||\ - _pdrvinfo->RxRate == DESC90_RATE5_5M ||\ - _pdrvinfo->RxRate == DESC90_RATE11M) &&\ - !_pdrvinfo->RxHT\ void CamResetAllEntry(struct net_device *dev) @@ -4228,6 +4222,22 @@ long rtl819x_signal_scale_mapping(long currsig) return retsig; } +static inline bool rx_hal_is_cck_rate(struct rx_drvinfo_819x_usb *pdrvinfo) +{ + if (pdrvinfo->RxHT) + return false; + + switch (pdrvinfo->RxRate) { + case DESC90_RATE1M: + case DESC90_RATE2M: + case DESC90_RATE5_5M: + case DESC90_RATE11M: + return true; + default: + return false; + } +} + static void rtl8192_query_rxphystatus(struct r8192_priv *priv, struct ieee80211_rx_stats *pstats, rx_drvinfo_819x_usb *pdrvinfo, |
