From owner-svn-src-all@FreeBSD.ORG Wed Nov 7 06:29:45 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7CB33C35; Wed, 7 Nov 2012 06:29:45 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5A7A88FC14; Wed, 7 Nov 2012 06:29:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA76Tju4065008; Wed, 7 Nov 2012 06:29:45 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA76TjiS065006; Wed, 7 Nov 2012 06:29:45 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201211070629.qA76TjiS065006@svn.freebsd.org> From: Adrian Chadd Date: Wed, 7 Nov 2012 06:29:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r242690 - head/sys/dev/ath X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Nov 2012 06:29:45 -0000 Author: adrian Date: Wed Nov 7 06:29:45 2012 New Revision: 242690 URL: http://svnweb.freebsd.org/changeset/base/242690 Log: Disable my software queue TIM and PS handling for now. ps-poll is totally broken in its current form. This should unbreak things enough to let people use PS-POLL devices, but leave it in place for me to finish PS-POLL handling. Modified: head/sys/dev/ath/if_ath.c Modified: head/sys/dev/ath/if_ath.c ============================================================================== --- head/sys/dev/ath/if_ath.c Wed Nov 7 06:23:23 2012 (r242689) +++ head/sys/dev/ath/if_ath.c Wed Nov 7 06:29:45 2012 (r242690) @@ -117,6 +117,15 @@ __FBSDID("$FreeBSD$"); #include #endif +#ifdef ATH_DEBUG +#include +#endif + +/* + * Only enable this if you're working on PS-POLL support. + */ +#undef ATH_SW_PSQ + /* * ATH_BCBUF determines the number of vap's that can transmit * beacons and also (currently) the number of vap's that can @@ -877,6 +886,13 @@ ath_attach(u_int16_t devid, struct ath_s #endif /* ATH_ENABLE_RADIOTAP_VENDOR_EXT */ /* + * Setup the ALQ logging if required + */ +#ifdef ATH_DEBUG + if_ath_alq_init(&sc->sc_alq, device_get_nameunit(sc->sc_dev)); +#endif + + /* * Setup dynamic sysctl's now that country code and * regdomain are available from the hal. */ @@ -936,6 +952,10 @@ ath_detach(struct ath_softc *sc) #endif ath_rate_detach(sc->sc_rc); +#ifdef ATH_DEBUG + if_ath_alq_tidyup(&sc->sc_alq); +#endif + ath_dfs_detach(sc); ath_desc_free(sc); ath_txdma_teardown(sc); @@ -5424,6 +5444,7 @@ ath_dfs_tasklet(void *p, int npending) static void ath_node_powersave(struct ieee80211_node *ni, int enable) { +#ifdef ATH_SW_PSQ struct ath_node *an = ATH_NODE(ni); struct ieee80211com *ic = ni->ni_ic; struct ath_softc *sc = ic->ic_ifp->if_softc; @@ -5443,6 +5464,12 @@ ath_node_powersave(struct ieee80211_node /* Update net80211 state */ avp->av_node_ps(ni, enable); +#else + struct ath_vap *avp = ATH_VAP(ni->ni_vap); + + /* Update net80211 state */ + avp->av_node_ps(ni, enable); +#endif/* ATH_SW_PSQ */ } /* @@ -5483,6 +5510,7 @@ ath_node_powersave(struct ieee80211_node static int ath_node_set_tim(struct ieee80211_node *ni, int enable) { +#ifdef ATH_SW_PSQ struct ieee80211com *ic = ni->ni_ic; struct ath_softc *sc = ic->ic_ifp->if_softc; struct ath_node *an = ATH_NODE(ni); @@ -5567,6 +5595,11 @@ ath_node_set_tim(struct ieee80211_node * } return (changed); +#else + struct ath_vap *avp = ATH_VAP(ni->ni_vap); + + return (avp->av_set_tim(ni, enable)); +#endif /* ATH_SW_PSQ */ } /* @@ -5594,6 +5627,7 @@ void ath_tx_update_tim(struct ath_softc *sc, struct ieee80211_node *ni, int enable) { +#ifdef ATH_SW_PSQ struct ath_node *an; struct ath_vap *avp; @@ -5657,6 +5691,9 @@ ath_tx_update_tim(struct ath_softc *sc, ATH_NODE_UNLOCK(an); } } +#else + return; +#endif /* ATH_SW_PSQ */ } MODULE_VERSION(if_ath, 1);