From owner-svn-src-user@FreeBSD.ORG Fri Sep 23 15:36:53 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23FE7106566B; Fri, 23 Sep 2011 15:36:53 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 148008FC14; Fri, 23 Sep 2011 15:36:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8NFaqc7077967; Fri, 23 Sep 2011 15:36:52 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8NFaq9A077964; Fri, 23 Sep 2011 15:36:52 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201109231536.p8NFaq9A077964@svn.freebsd.org> From: Adrian Chadd Date: Fri, 23 Sep 2011 15:36:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225743 - user/adrian/if_ath_tx/sys/dev/ath X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Sep 2011 15:36:53 -0000 Author: adrian Date: Fri Sep 23 15:36:52 2011 New Revision: 225743 URL: http://svn.freebsd.org/changeset/base/225743 Log: For now, break out the beacon processing task into a separate task so it doesn't interrupt TX or RX completion. Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c user/adrian/if_ath_tx/sys/dev/ath/if_athvar.h Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_ath.c Fri Sep 23 15:32:03 2011 (r225742) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath.c Fri Sep 23 15:36:52 2011 (r225743) @@ -380,6 +380,7 @@ ath_attach(u_int16_t devid, struct ath_s TASK_INIT(&sc->sc_rxtask, 0, ath_rx_proc, sc); TASK_INIT(&sc->sc_bmisstask, 0, ath_bmiss_proc, sc); TASK_INIT(&sc->sc_bstucktask,0, ath_bstuck_proc, sc); + TASK_INIT(&sc->sc_bproctask, 0, ath_beacon_proc, sc); /* * Allocate hardware transmit queues: one queue for @@ -1398,7 +1399,7 @@ ath_intr(void *arg) } else #endif { - ath_beacon_proc(sc, 0); + taskqueue_enqueue_fast(sc->sc_tq, &sc->sc_bproctask); #ifdef IEEE80211_SUPPORT_SUPERG /* * Schedule the rx taskq in case there's no Modified: user/adrian/if_ath_tx/sys/dev/ath/if_athvar.h ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_athvar.h Fri Sep 23 15:32:03 2011 (r225742) +++ user/adrian/if_ath_tx/sys/dev/ath/if_athvar.h Fri Sep 23 15:36:52 2011 (r225743) @@ -461,6 +461,7 @@ struct ath_softc { struct ath_txq *sc_cabq; /* tx q for cab frames */ struct task sc_bmisstask; /* bmiss int processing */ struct task sc_bstucktask; /* stuck beacon processing */ + struct task sc_bproctask; /* beacon processing */ enum { OK, /* no change needed */ UPDATE, /* update pending */