mirrors/madwifi
1
0
Fork 0
mirror of https://github.com/proski/madwifi synced 2024-11-22 06:21:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Diversity and Antenna code cleanup:

Browse Source 
* Tidy, including refactoring and variable rename for clarity and consistency
 * Move some variable initialisation out of sysctl register where it does not belong.
 * Only change antenna based on RX traffic if both diversity and an RX antenna is not set
 * Set HW/HAL diversity setting on HW/HAL reset


git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3717 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
mentor 2008-06-10 15:32:45 +00:00
parent b5b0838767
commit cc4fba0582
2 changed files with 50 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
ath/if_ath.c
View File

@ -884,6 +884,8 @@ ath_attach(u_int16_t devid, struct net_device *dev, HAL_BUS_TAG tag)
ic->ic_updateslot = ath_updateslot; ic->ic_updateslot = ath_updateslot;
atomic_set(&ic->ic_node_counter, 0); atomic_set(&ic->ic_node_counter, 0);
ic->ic_debug = 0; ic->ic_debug = 0;
sc->sc_debug = (ath_debug & ~ATH_DEBUG_GLOBAL);
sc->sc_default_ieee80211_debug = ieee80211_debug;
ic->ic_wme.wme_update = ath_wme_update; ic->ic_wme.wme_update = ath_wme_update;
ic->ic_uapsd_flush = ath_uapsd_flush; ic->ic_uapsd_flush = ath_uapsd_flush;
@ -1005,20 +1007,13 @@ ath_attach(u_int16_t devid, struct net_device *dev, HAL_BUS_TAG tag)
*/ */
ic->ic_flags |= IEEE80211_F_DATAPAD; ic->ic_flags |= IEEE80211_F_DATAPAD;
/* /* Query the HAL about antenna support
* Query the HAL about antenna support * Enable RX fast diversity if HAL has support. */
* Enable rx fast diversity if HAL has support sc->sc_hasdiversity = sc->sc_diversity = !!ath_hal_hasdiversity(ah);
*/ ath_hal_setdiversity(ah, sc->sc_diversity);
if (ath_hal_hasdiversity(ah)) {
sc->sc_hasdiversity = 1; sc->sc_rxantenna = ath_hal_getdefantenna(ah);
ath_hal_setdiversity(ah, AH_TRUE); sc->sc_txantenna = 0; /* default to auto-selection */
sc->sc_diversity = 1;
} else {
sc->sc_hasdiversity = 0;
sc->sc_diversity = 0;
ath_hal_setdiversity(ah, AH_FALSE);
}
sc->sc_defant = ath_hal_getdefantenna(ah);
/* /*
* Not all chips have the VEOL support we want to * Not all chips have the VEOL support we want to
@ -1026,6 +1021,7 @@ ath_attach(u_int16_t devid, struct net_device *dev, HAL_BUS_TAG tag)
*/ */
sc->sc_hasveol = ath_hal_hasveol(ah); sc->sc_hasveol = ath_hal_hasveol(ah);
sc->sc_txintrperiod = ATH_TXQ_INTR_PERIOD;
/* get mac address from hardware */ /* get mac address from hardware */
ath_hal_getmac(ah, ic->ic_myaddr); ath_hal_getmac(ah, ic->ic_myaddr);
@ -1724,7 +1720,8 @@ static HAL_BOOL ath_hw_reset(struct ath_softc *sc, HAL_OPMODE opmode,
if (sc->sc_softled) if (sc->sc_softled)
ath_hal_gpioCfgOutput(sc->sc_ah, sc->sc_ledpin); ath_hal_gpioCfgOutput(sc->sc_ah, sc->sc_ledpin);
ath_update_txpow(sc); /* Update TX power state. */ ath_update_txpow(sc); /* Update TX power state. */
ath_setdefantenna(sc, sc->sc_defant); ath_hal_setdiversity(sc->sc_ah, sc->sc_diversity);
ath_setdefantenna(sc, sc->sc_rxantenna);
/* XXX: Any other clobbered features? */ /* XXX: Any other clobbered features? */
ath_radar_update(sc); ath_radar_update(sc);
@ -3007,7 +3004,7 @@ ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb)
unsigned int pktlen, hdrlen, try0, power; unsigned int pktlen, hdrlen, try0, power;
HAL_PKT_TYPE atype; HAL_PKT_TYPE atype;
u_int flags; u_int flags;
u_int8_t antenna, txrate; u_int8_t txrate;
struct ath_txq *txq = NULL; struct ath_txq *txq = NULL;
struct ath_desc *ds = NULL; struct ath_desc *ds = NULL;
struct ieee80211_frame *wh; struct ieee80211_frame *wh;
@ -3047,7 +3044,6 @@ ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb)
flags |= HAL_TXDESC_INTREQ; flags |= HAL_TXDESC_INTREQ;
antenna = sc->sc_txantenna;
/* XXX check return value? */ /* XXX check return value? */
ath_hal_setuptxdesc(ah, ds, ath_hal_setuptxdesc(ah, ds,
@ -3057,7 +3053,7 @@ ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb)
power, /* txpower */ power, /* txpower */
txrate, try0, /* series 0 rate/tries */ txrate, try0, /* series 0 rate/tries */
HAL_TXKEYIX_INVALID, /* key cache index */ HAL_TXKEYIX_INVALID, /* key cache index */
antenna, /* antenna mode */ sc->sc_txantenna, /* antenna mode */
flags, /* flags */ flags, /* flags */
0, /* rts/cts rate */ 0, /* rts/cts rate */
0, /* rts/cts duration */ 0, /* rts/cts duration */
@ -4866,7 +4862,7 @@ ath_beacon_setup(struct ath_softc *sc, struct ath_buf *bf)
struct ieee80211com *ic = SKB_NI(bf->bf_skb)->ni_ic; struct ieee80211com *ic = SKB_NI(bf->bf_skb)->ni_ic;
struct sk_buff *skb = bf->bf_skb; struct sk_buff *skb = bf->bf_skb;
struct ath_hal *ah = sc->sc_ah; struct ath_hal *ah = sc->sc_ah;
struct ath_desc *ds; struct ath_desc *ds = bf->bf_desc;
unsigned int flags; unsigned int flags;
int antenna = sc->sc_txantenna; int antenna = sc->sc_txantenna;
const HAL_RATE_TABLE *rt; const HAL_RATE_TABLE *rt;
@ -4876,22 +4872,16 @@ ath_beacon_setup(struct ath_softc *sc, struct ath_buf *bf)
DPRINTF(sc, ATH_DEBUG_BEACON_PROC, "skb=%p skb->len=%u\n", DPRINTF(sc, ATH_DEBUG_BEACON_PROC, "skb=%p skb->len=%u\n",
skb, skb->len); skb, skb->len);
/* setup descriptors */
ds = bf->bf_desc;
flags = HAL_TXDESC_NOACK; flags = HAL_TXDESC_NOACK;
#ifdef ATH_SUPERG_DYNTURBO #ifdef ATH_SUPERG_DYNTURBO
if (sc->sc_dturbo_switch) if (sc->sc_dturbo_switch)
flags |= HAL_TXDESC_INTREQ; flags |= HAL_TXDESC_INTREQ;
#endif #endif
ds->ds_link = 0; /* Switch antenna every beacon if txantenna is not set
/*
* Switch antenna every beacon if txantenna is not set
* Should only switch every beacon period, not for all * Should only switch every beacon period, not for all
* SWBAs * SWBAs
* XXX: assumes two antennae * XXX: assumes two antennae */
*/
if (antenna == 0) { if (antenna == 0) {
if (sc->sc_stagbeacons) if (sc->sc_stagbeacons)
antenna = ((sc->sc_stats.ast_be_xmit / antenna = ((sc->sc_stats.ast_be_xmit /
@ -4900,7 +4890,6 @@ ath_beacon_setup(struct ath_softc *sc, struct ath_buf *bf)
antenna = (sc->sc_stats.ast_be_xmit & 1 ? 2 : 1); antenna = (sc->sc_stats.ast_be_xmit & 1 ? 2 : 1);
} }
ds->ds_data = bf->bf_skbaddr;
/* /*
* Calculate rate code. * Calculate rate code.
* XXX everything at min xmit rate * XXX everything at min xmit rate
@ -4927,6 +4916,8 @@ ath_beacon_setup(struct ath_softc *sc, struct ath_buf *bf)
rate = rt->info[IEEE80211_XR_DEFAULT_RATE_INDEX].rateCode; rate = rt->info[IEEE80211_XR_DEFAULT_RATE_INDEX].rateCode;
} }
#endif #endif
ds->ds_link = 0;
ds->ds_data = bf->bf_skbaddr;
ath_hal_setuptxdesc(ah, ds, ath_hal_setuptxdesc(ah, ds,
skb->len + IEEE80211_CRC_LEN, /* frame length */ skb->len + IEEE80211_CRC_LEN, /* frame length */
sizeof(struct ieee80211_frame), /* header length */ sizeof(struct ieee80211_frame), /* header length */
@ -5291,22 +5282,21 @@ ath_beacon_send(struct ath_softc *sc, int *needmark, uint64_t hw_tsf)
} else if ((sc->sc_updateslot == COMMIT) && (sc->sc_slotupdate == slot)) } else if ((sc->sc_updateslot == COMMIT) && (sc->sc_slotupdate == slot))
ath_setslottime(sc); /* commit change to hardware */ ath_setslottime(sc); /* commit change to hardware */
if ((!sc->sc_stagbeacons || slot == 0) && (!sc->sc_diversity)) { /* If HW fast diversity is not enabled and there is not default RX
* antenna set, check recent per-antenna transmit statistics and flip
* the default RX antenna if noticeably more frames went out on the
* non-default antenna. */
if ((!sc->sc_stagbeacons || slot == 0) &&
!sc->sc_diversity && !sc->sc_rxantenna) {
unsigned int otherant; unsigned int otherant;
/* /* XXX: assumes 2 antennae. */
* Check recent per-antenna transmit statistics and flip otherant = sc->sc_rxantenna & 1 ? 2 : 1;
* the default rx antenna if noticeably more frames went out if (sc->sc_ant_tx[otherant] > sc->sc_ant_tx[sc->sc_rxantenna] +
* on the non-default antenna. Only do this if rx diversity
* is off.
* XXX assumes 2 antennae
*/
otherant = sc->sc_defant & 1 ? 2 : 1;
if (sc->sc_ant_tx[otherant] > sc->sc_ant_tx[sc->sc_defant] +
ATH_ANTENNA_DIFF) { ATH_ANTENNA_DIFF) {
DPRINTF(sc, ATH_DEBUG_BEACON, DPRINTF(sc, ATH_DEBUG_BEACON,
"Flip default antenna to %u, %u > %u\n", "Flip default RX antenna to %u, %u > %u\n",
otherant, sc->sc_ant_tx[otherant], otherant, sc->sc_ant_tx[otherant],
sc->sc_ant_tx[sc->sc_defant]); sc->sc_ant_tx[sc->sc_rxantenna]);
ath_setdefantenna(sc, otherant); ath_setdefantenna(sc, otherant);
} }
sc->sc_ant_tx[1] = sc->sc_ant_tx[2] = 0; sc->sc_ant_tx[1] = sc->sc_ant_tx[2] = 0;
@ -6470,12 +6460,12 @@ ath_setdefantenna(struct ath_softc *sc, u_int antenna)
{ {
struct ath_hal *ah = sc->sc_ah; struct ath_hal *ah = sc->sc_ah;
/* XXX block beacon interrupts */ /* XXX: block beacon interrupts */
ath_hal_setdefantenna(ah, antenna); ath_hal_setdefantenna(ah, antenna);
if (sc->sc_defant != antenna) if (sc->sc_rxantenna != antenna)
sc->sc_stats.ast_ant_defswitch++; sc->sc_stats.ast_ant_defswitch++;
sc->sc_defant = antenna; sc->sc_rxantenna = antenna;
sc->sc_rxotherant = 0; sc->sc_numrxotherant = 0;
} }
static void static void
@ -6721,15 +6711,16 @@ rx_accept:
} }
skb = NULL; /* SKB is no longer ours. */ skb = NULL; /* SKB is no longer ours. */
/* XXX: Why do this? */
if (sc->sc_diversity) { if (sc->sc_diversity) {
/* When using hardware fast diversity, change the default RX /* When using hardware fast diversity, change the
* antenna if RX diversity chooses the other antenna 3 * default RX antenna if RX diversity chooses the
* times in a row. */ * other antenna 3 times in a row. */
if (sc->sc_defant != rs->rs_antenna) { if (sc->sc_rxantenna != rs->rs_antenna) {
if (++sc->sc_rxotherant >= 3) if (++sc->sc_numrxotherant >= 3)
ath_setdefantenna(sc, rs->rs_antenna); ath_setdefantenna(sc, rs->rs_antenna);
} else } else
sc->sc_rxotherant = 0; sc->sc_numrxotherant = 0;
} }
if (sc->sc_softled) { if (sc->sc_softled) {
@ -7981,12 +7972,10 @@ ath_tx_start(struct net_device *dev, struct ieee80211_node *ni,
} }
#endif #endif
/* /* sc_txantenna == 0 means transmit diversity mode.
* sc_txantenna == 0 means transmit diversity mode.
* sc_txantenna == 1 or sc_txantenna == 2 means the user has selected * sc_txantenna == 1 or sc_txantenna == 2 means the user has selected
* the first or second antenna port. * the first or second antenna port.
* If the user has set the txantenna, use it for multicast frames too. * If the user has set the txantenna, use it for multicast frames too. */
*/
if (ismcast && !sc->sc_txantenna) { if (ismcast && !sc->sc_txantenna) {
antenna = sc->sc_mcastantenna + 1; antenna = sc->sc_mcastantenna + 1;
sc->sc_mcastantenna = (sc->sc_mcastantenna + 1) & 0x1; sc->sc_mcastantenna = (sc->sc_mcastantenna + 1) & 0x1;
@ -8008,9 +7997,7 @@ ath_tx_start(struct net_device *dev, struct ieee80211_node *ni,
try0, keyix, antenna, flags, ctsrate, ctsduration, icvlen, ivlen, try0, keyix, antenna, flags, ctsrate, ctsduration, icvlen, ivlen,
comp); comp);
/* /* Formulate first tx descriptor with tx controls. */
* Formulate first tx descriptor with tx controls.
*/
/* XXX check return value? */ /* XXX check return value? */
ath_hal_setuptxdesc(ah, ds, ath_hal_setuptxdesc(ah, ds,
pktlen, /* packet length */ pktlen, /* packet length */
@ -11194,13 +11181,6 @@ ath_dynamic_sysctl_register(struct ath_softc *sc)
kfree(sc->sc_sysctls); kfree(sc->sc_sysctls);
sc->sc_sysctls = NULL; sc->sc_sysctls = NULL;
} }
/* initialize values */
ath_debug_global = (ath_debug & ATH_DEBUG_GLOBAL);
sc->sc_debug = (ath_debug & ~ATH_DEBUG_GLOBAL);
sc->sc_default_ieee80211_debug = ieee80211_debug;
sc->sc_txantenna = 0; /* default to auto-selection */
sc->sc_txintrperiod = ATH_TXQ_INTR_PERIOD;
} }
static void static void
@ -11471,7 +11451,8 @@ txcont_configure_radio(struct ieee80211com *ic)
vap->iv_ath_cap &= ~IEEE80211_ATHC_COMP; vap->iv_ath_cap &= ~IEEE80211_ATHC_COMP;
vap->iv_des_ssid[0].len = 0; vap->iv_des_ssid[0].len = 0;
vap->iv_des_nssid = 1; vap->iv_des_nssid = 1;
sc->sc_txantenna = sc->sc_defant = sc->sc_mcastantenna = sc->sc_rxotherant = 1; sc->sc_txantenna = sc->sc_rxantenna = sc->sc_mcastantenna = 1;
sc->sc_numrxotherant = 0;
sc->sc_diversity = 0; sc->sc_diversity = 0;
memset(vap->iv_des_ssid[0].ssid, 0, IEEE80211_ADDR_LEN); memset(vap->iv_des_ssid[0].ssid, 0, IEEE80211_ADDR_LEN);
ath_hal_setdiversity(sc->sc_ah, 0); ath_hal_setdiversity(sc->sc_ah, 0);

4
ath/if_athvar.h
View File

@ -726,6 +726,8 @@ struct ath_softc {
u_int8_t sc_protrix; /* protection rate index */ u_int8_t sc_protrix; /* protection rate index */
u_int8_t sc_mcastantenna; /* Multicast antenna number */ u_int8_t sc_mcastantenna; /* Multicast antenna number */
u_int8_t sc_txantenna; /* data tx antenna (fixed or auto) */ u_int8_t sc_txantenna; /* data tx antenna (fixed or auto) */
u_int8_t sc_rxantenna; /* current default antenna */
u_int8_t sc_numrxotherant; /* RXs on non-default antenna */
u_int16_t sc_nvaps; /* # of active virtual APs */ u_int16_t sc_nvaps; /* # of active virtual APs */
u_int8_t sc_nstavaps; /* # of active station VAPs */ u_int8_t sc_nstavaps; /* # of active station VAPs */
u_int8_t sc_nmonvaps; /* # of monitor VAPs */ u_int8_t sc_nmonvaps; /* # of monitor VAPs */
@ -756,8 +758,6 @@ struct ath_softc {
spinlock_t sc_rxbuflock; spinlock_t sc_rxbuflock;
struct ATH_TQ_STRUCT sc_rxtq; /* rx intr tasklet */ struct ATH_TQ_STRUCT sc_rxtq; /* rx intr tasklet */
struct ATH_TQ_STRUCT sc_rxorntq; /* rxorn intr tasklet */ struct ATH_TQ_STRUCT sc_rxorntq; /* rxorn intr tasklet */
u_int8_t sc_defant; /* current default antenna */
u_int8_t sc_rxotherant; /* RXs on non-default antenna */
u_int16_t sc_cachelsz; /* cache line size */ u_int16_t sc_cachelsz; /* cache line size */
struct ath_descdma sc_txdma; /* TX descriptors */ struct ath_descdma sc_txdma; /* TX descriptors */