From owner-svn-src-user@FreeBSD.ORG Fri Apr 17 16:52:16 2009 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 ECA40106564A; Fri, 17 Apr 2009 16:52:16 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DAEF28FC19; Fri, 17 Apr 2009 16:52:16 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3HGqGN7028528; Fri, 17 Apr 2009 16:52:16 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3HGqGiK028526; Fri, 17 Apr 2009 16:52:16 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <200904171652.n3HGqGiK028526@svn.freebsd.org> From: Andrew Thompson Date: Fri, 17 Apr 2009 16:52:16 +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: r191211 - in user/thompsa/vaptq/sys: dev/iwi net80211 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, 17 Apr 2009 16:52:17 -0000 Author: thompsa Date: Fri Apr 17 16:52:16 2009 New Revision: 191211 URL: http://svn.freebsd.org/changeset/base/191211 Log: Fix build. Modified: user/thompsa/vaptq/sys/dev/iwi/if_iwi.c user/thompsa/vaptq/sys/net80211/ieee80211_var.h Modified: user/thompsa/vaptq/sys/dev/iwi/if_iwi.c ============================================================================== --- user/thompsa/vaptq/sys/dev/iwi/if_iwi.c Fri Apr 17 16:42:57 2009 (r191210) +++ user/thompsa/vaptq/sys/dev/iwi/if_iwi.c Fri Apr 17 16:52:16 2009 (r191211) @@ -487,7 +487,6 @@ iwi_detach(device_t dev) delete_unrhdr(sc->sc_unr); IWI_LOCK_DESTROY(sc); - IWI_CMD_LOCK_DESTROY(sc); if_free(ifp); @@ -3172,7 +3171,6 @@ iwi_stop_locked(void *priv) iwi_reset_tx_ring(sc, &sc->txq[3]); iwi_reset_rx_ring(sc, &sc->rxq); - memset(sc->sc_cmd, 0, sizeof(sc->sc_cmd)); sc->sc_tx_timer = 0; sc->sc_state_timer = 0; sc->sc_busy_timer = 0; @@ -3234,7 +3232,6 @@ iwi_rfkill_poll(void *arg) * it is enabled so we must poll for the latter. */ if (!iwi_getrfkill(sc)) { - taskqueue_unblock(sc->sc_tq); taskqueue_enqueue(taskqueue_swi, &sc->sc_radiontask); return; } Modified: user/thompsa/vaptq/sys/net80211/ieee80211_var.h ============================================================================== --- user/thompsa/vaptq/sys/net80211/ieee80211_var.h Fri Apr 17 16:42:57 2009 (r191210) +++ user/thompsa/vaptq/sys/net80211/ieee80211_var.h Fri Apr 17 16:52:16 2009 (r191211) @@ -129,6 +129,7 @@ struct ieee80211com { struct task ic_promisc_task;/* deferred promisc update */ struct task ic_mcast_task; /* deferred mcast update */ struct task ic_chan_task; /* deferred channel change */ + struct task ic_bmiss_task; /* deferred beacon miss hndlr */ uint32_t ic_flags; /* state flags */ uint32_t ic_flags_ext; /* extended state flags */