Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 17 Apr 2009 16:52:16 +0000 (UTC)
From:      Andrew Thompson <thompsa@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r191211 - in user/thompsa/vaptq/sys: dev/iwi net80211
Message-ID:  <200904171652.n3HGqGiK028526@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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 */

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904171652.n3HGqGiK028526>