commit a3eda4e3c3e5dd2f79111f8de0d9d09fc900e257 Author: Jiri Slaby Date: Thu Jul 19 07:26:12 2007 +0200 RX_FILTER cleanup (remove double defs) diff --git a/ath.c b/ath.c index 75c16bc..92090f1 100644 --- a/ath.c +++ b/ath.c @@ -37,6 +37,7 @@ #include #include "ath.h" +#include "ath5k_reg.h" #define ATH_DEBUG_MODES 0 /* Show found modes in the log? */ #define ATH_DUMP_SKB 0 /* show skb contents */ @@ -457,19 +458,15 @@ static u32 ath_calcrxfilter(struct ath_softc *sc) struct ath_hw *ah = sc->ah; u32 rfilt; - rfilt = (ath5k_hw_get_rx_filter(ah) & AR5K_RX_FILTER_PHYERROR) | + rfilt = (ath5k_hw_get_rx_filter(ah) & AR5K_RX_FILTER_PHYERR) | AR5K_RX_FILTER_UCAST | AR5K_RX_FILTER_BCAST | - AR5K_RX_FILTER_MCAST | AR5K_RX_FILTER_PHYRADAR; + AR5K_RX_FILTER_MCAST | AR5K_RX_FILTER_RADARERR; #ifdef BLE - if (ic->ic_opmode != IEEE80211_M_STA && - ic->ic_opmode != IEEE80211_M_AHDEMO) + if (opmode != IEEE80211_M_STA && opmode != IEEE80211_M_AHDEMO) rfilt |= AR5K_RX_FILTER_PROBEREQ; - if (ic->ic_opmode != IEEE80211_M_HOSTAP && - (dev->flags & IFF_PROMISC)) + if (opmode != IEEE80211_M_HOSTAP && (dev->flags & IFF_PROMISC)) rfilt |= AR5K_RX_FILTER_PROM; - if (ic->ic_opmode == IEEE80211_M_STA || - ic->ic_opmode == IEEE80211_M_IBSS || - state == IEEE80211_S_SCAN) + if (opmode == IEEE80211_M_STA || opmode == IEEE80211_M_IBSS || state == IEEE80211_S_SCAN) #endif rfilt |= AR5K_RX_FILTER_BEACON; diff --git a/ath5k.h b/ath5k.h index 6956326..cbab742 100644 --- a/ath5k.h +++ b/ath5k.h @@ -454,21 +454,6 @@ struct ath_rx_status { #define AR5K_RXKEYIX_INVALID ((u8) - 1) #define AR5K_TXKEYIX_INVALID ((u32) - 1) -/* - * RX filters - * Most of them are not yet used inside OpenHAL - */ -#define AR5K_RX_FILTER_UCAST 0x00000001 /* Don't filter unicast frames */ -#define AR5K_RX_FILTER_MCAST 0x00000002 /* Don't filter multicast frames */ -#define AR5K_RX_FILTER_BCAST 0x00000004 /* Don't filter broadcast frames */ -#define AR5K_RX_FILTER_CONTROL 0x00000008 /* Don't filter control frames */ -#define AR5K_RX_FILTER_BEACON 0x00000010 /* Don't filter beacon frames */ -#define AR5K_RX_FILTER_PROM 0x00000020 /* Set promiscuous mode */ -#define AR5K_RX_FILTER_XRPOLL 0x00000040 /* Don't filter XR poll frame */ -#define AR5K_RX_FILTER_PROBEREQ 0x00000080 /* Don't filter probe requests */ -#define AR5K_RX_FILTER_PHYERROR 0x00000100 /* Don't filter phy errors */ -#define AR5K_RX_FILTER_PHYRADAR 0x00000200 /* Don't filter phy radar errors*/ - struct ath5k_mib_stats { u32 ackrcv_bad; u32 rts_bad; diff --git a/ath5k_hw.c b/ath5k_hw.c index 80a6ca8..4cfafc8 100644 --- a/ath5k_hw.c +++ b/ath5k_hw.c @@ -2700,19 +2700,19 @@ ath5k_hw_clear_mcast_filter_idx(struct ath_hw *hal, u32 index) * Get current rx filter */ u32 -ath5k_hw_get_rx_filter(struct ath_hw *hal) +ath5k_hw_get_rx_filter(struct ath_hw *ah) { u32 data, filter = 0; AR5K_TRACE; - filter = ath5k_hw_reg_read(hal, AR5K_RX_FILTER); + filter = ath5k_hw_reg_read(ah, AR5K_RX_FILTER); /*Radar detection for 5212*/ - if (hal->ah_version == AR5K_AR5212) { - data = ath5k_hw_reg_read(hal, AR5K_PHY_ERR_FIL); + if (ah->ah_version == AR5K_AR5212) { + data = ath5k_hw_reg_read(ah, AR5K_PHY_ERR_FIL); if (data & AR5K_PHY_ERR_FIL_RADAR) - filter |= AR5K_RX_FILTER_PHYRADAR; + filter |= AR5K_RX_FILTER_RADARERR; if (data & (AR5K_PHY_ERR_FIL_OFDM | AR5K_PHY_ERR_FIL_CCK)) filter |= AR5K_RX_FILTER_PHYERR; } @@ -2724,15 +2724,15 @@ ath5k_hw_get_rx_filter(struct ath_hw *hal) * Set rx filter */ void -ath5k_hw_set_rx_filter(struct ath_hw *hal, u32 filter) +ath5k_hw_set_rx_filter(struct ath_hw *ah, u32 filter) { u32 data = 0; AR5K_TRACE; /* Set PHY error filter register on 5212*/ - if (hal->ah_version == AR5K_AR5212) { - if (filter & AR5K_RX_FILTER_PHYRADAR) + if (ah->ah_version == AR5K_AR5212) { + if (filter & AR5K_RX_FILTER_RADARERR) data |= AR5K_PHY_ERR_FIL_RADAR; if (filter & AR5K_RX_FILTER_PHYERR) data |= AR5K_PHY_ERR_FIL_OFDM | AR5K_PHY_ERR_FIL_CCK; @@ -2741,24 +2741,24 @@ ath5k_hw_set_rx_filter(struct ath_hw *hal, u32 filter) /* * The AR5210 uses promiscous mode to detect radar activity */ - if ((hal->ah_version == AR5K_AR5210) && - (filter & AR5K_RX_FILTER_PHYRADAR)) { - filter &= ~AR5K_RX_FILTER_PHYRADAR; + if (ah->ah_version == AR5K_AR5210 && + (filter & AR5K_RX_FILTER_RADARERR)) { + filter &= ~AR5K_RX_FILTER_RADARERR; filter |= AR5K_RX_FILTER_PROM; } /*Zero length DMA*/ if (data) - AR5K_REG_ENABLE_BITS(hal, AR5K_RXCFG, AR5K_RXCFG_ZLFDMA); + AR5K_REG_ENABLE_BITS(ah, AR5K_RXCFG, AR5K_RXCFG_ZLFDMA); else - AR5K_REG_DISABLE_BITS(hal, AR5K_RXCFG, AR5K_RXCFG_ZLFDMA); + AR5K_REG_DISABLE_BITS(ah, AR5K_RXCFG, AR5K_RXCFG_ZLFDMA); /*Write RX Filter register*/ - ath5k_hw_reg_write(hal, filter & 0xff, AR5K_RX_FILTER); + ath5k_hw_reg_write(ah, filter & 0xff, AR5K_RX_FILTER); /*Write PHY error filter register on 5212*/ - if (hal->ah_version == AR5K_AR5212) - ath5k_hw_reg_write(hal, data, AR5K_PHY_ERR_FIL); + if (ah->ah_version == AR5K_AR5212) + ath5k_hw_reg_write(ah, data, AR5K_PHY_ERR_FIL); } diff --git a/ath5k_reg.h b/ath5k_reg.h index e40706b..ec79bb7 100644 --- a/ath5k_reg.h +++ b/ath5k_reg.h @@ -1252,7 +1252,7 @@ */ #define AR5K_RX_FILTER_5210 0x804c /* Register Address [5210] */ #define AR5K_RX_FILTER_5211 0x803c /* Register Address [5211+] */ -#define AR5K_RX_FILTER (hal->ah_version == AR5K_AR5210 ? \ +#define AR5K_RX_FILTER (ah->ah_version == AR5K_AR5210 ? \ AR5K_RX_FILTER_5210 : AR5K_RX_FILTER_5211) #define AR5K_RX_FILTER_UCAST 0x00000001 /* Don't filter unicast frames */ #define AR5K_RX_FILTER_MCAST 0x00000002 /* Don't filter multicast frames */ @@ -1266,9 +1266,9 @@ #define AR5K_RX_FILTER_RADARERR_5212 0x00000200 /* Don't filter phy radar errors [5212+] */ #define AR5K_RX_FILTER_PHYERR_5211 0x00000040 /* [5211] */ #define AR5K_RX_FILTER_RADARERR_5211 0x00000080 /* [5211] */ -#define AR5K_RX_FILTER_PHYERR (hal->ah_version == AR5K_AR5211 ? \ +#define AR5K_RX_FILTER_PHYERR (ah->ah_version == AR5K_AR5211 ? \ AR5K_RX_FILTER_PHYERR_5211 : AR5K_RX_FILTER_PHYERR_5212) -#define AR5K_RX_FILTER_RADARERR (hal->ah_version == AR5K_AR5211 ? \ +#define AR5K_RX_FILTER_RADARERR (ah->ah_version == AR5K_AR5211 ? \ AR5K_RX_FILTER_RADARERR_5211 : AR5K_RX_FILTER_RADARERR_5212) /* * Multicast filter register (lower 32 bits)