Date: Fri, 23 Dec 2011 02:40:35 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r228830 - head/sys/dev/ath Message-ID: <201112230240.pBN2eZbw044608@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Fri Dec 23 02:40:35 2011 New Revision: 228830 URL: http://svn.freebsd.org/changeset/base/228830 Log: Make some more of the 11n specific code conditional. This doesn't fix compilation w/out AH_SUPPORT_AR5416 as all of the software aggregation support in if_ath_tx.c and 11n code in if_ath_tx_ht.c touches the 11n specific fields. I'll work on that later. Modified: head/sys/dev/ath/if_ath.c Modified: head/sys/dev/ath/if_ath.c ============================================================================== --- head/sys/dev/ath/if_ath.c Fri Dec 23 02:21:22 2011 (r228829) +++ head/sys/dev/ath/if_ath.c Fri Dec 23 02:40:35 2011 (r228830) @@ -3962,6 +3962,7 @@ ath_rx_proc(struct ath_softc *sc, int re npkts++; /* These aren't specifically errors */ +#ifdef AH_SUPPORT_AR5416 if (rs->rs_flags & HAL_RX_GI) sc->sc_stats.ast_rx_halfgi++; if (rs->rs_flags & HAL_RX_2040) @@ -3974,6 +3975,7 @@ ath_rx_proc(struct ath_softc *sc, int re sc->sc_stats.ast_rx_decrypt_busy_err++; if (rs->rs_flags & HAL_RX_HI_RX_CHAIN) sc->sc_stats.ast_rx_hi_rx_chain++; +#endif /* AH_SUPPORT_AR5416 */ if (rs->rs_status != 0) { if (rs->rs_status & HAL_RXERR_CRC) @@ -4191,8 +4193,10 @@ rx_accept: IEEE80211_KEYIX_NONE : rs->rs_keyix); sc->sc_lastrs = rs; +#ifdef AH_SUPPORT_AR5416 if (rs->rs_isaggr) sc->sc_stats.ast_rx_agg++; +#endif /* AH_SUPPORT_AR5416 */ if (ni != NULL) { /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112230240.pBN2eZbw044608>