svn commit: r189197 - user/thompsa/vaptq/sys/net80211

[Andrew Thompson]

Author: thompsa
Date: Sun Mar  1 01:27:58 2009
New Revision: 189197
URL: http://svn.freebsd.org/changeset/base/189197

Log:
  Add taskqueue events for promisc and mcast update.

Modified:
  user/thompsa/vaptq/sys/net80211/ieee80211.c
  user/thompsa/vaptq/sys/net80211/ieee80211_proto.c
  user/thompsa/vaptq/sys/net80211/ieee80211_scan_sta.c
  user/thompsa/vaptq/sys/net80211/ieee80211_var.h

Modified: user/thompsa/vaptq/sys/net80211/ieee80211.c
==============================================================================
--- user/thompsa/vaptq/sys/net80211/ieee80211.c	Sat Feb 28 22:58:52 2009	(r189196)
+++ user/thompsa/vaptq/sys/net80211/ieee80211.c	Sun Mar  1 01:27:58 2009	(r189197)
@@ -624,9 +624,11 @@ ieee80211_syncifflag_locked(struct ieee8
 		/* XXX should we return 1/0 and let caller do this? */
 		if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
 			if (flag == IFF_PROMISC)
-				ic->ic_update_promisc(ifp);
+				taskqueue_enqueue(ic->ic_tq,
+				    &ic->ic_promisc_task);
 			else if (flag == IFF_ALLMULTI)
-				ic->ic_update_mcast(ifp);
+				taskqueue_enqueue(ic->ic_tq,
+				    &ic->ic_mcast_task);
 		}
 	}
 }

Modified: user/thompsa/vaptq/sys/net80211/ieee80211_proto.c
==============================================================================
--- user/thompsa/vaptq/sys/net80211/ieee80211_proto.c	Sat Feb 28 22:58:52 2009	(r189196)
+++ user/thompsa/vaptq/sys/net80211/ieee80211_proto.c	Sun Mar  1 01:27:58 2009	(r189197)
@@ -97,6 +97,8 @@ const char *ieee80211_wme_acnames[] = {
 };
 
 static void parent_updown(void *, int);
+static void update_mcast(void *, int);
+static void update_promisc(void *, int);
 static void ieee80211_newstate_cb(void *, int);
 static int ieee80211_newstate_cb_locked(struct ieee80211vap *,
 	enum ieee80211_state, int);
@@ -134,6 +136,8 @@ ieee80211_proto_attach(struct ieee80211c
 	ic->ic_protmode = IEEE80211_PROT_CTSONLY;
 
 	TASK_INIT(&ic->ic_parent_task, 0, parent_updown, ifp);
+	TASK_INIT(&ic->ic_mcast_task, 0, update_mcast, ic);
+	TASK_INIT(&ic->ic_promisc_task, 0, update_promisc, ic);
 
 	ic->ic_wme.wme_hipri_switch_hysteresis =
 		AGGRESSIVE_MODE_SWITCH_HYSTERESIS;
@@ -1076,6 +1080,24 @@ parent_updown(void *arg, int npending)
 	parent->if_ioctl(parent, SIOCSIFFLAGS, NULL);
 }
 
+static void
+update_mcast(void *arg, int npending)
+{
+	struct ieee80211com *ic = arg;
+	struct ifnet *parent = ic->ic_ifp;
+
+	ic->ic_update_mcast(parent);
+}
+
+static void
+update_promisc(void *arg, int npending)
+{
+	struct ieee80211com *ic = arg;
+	struct ifnet *parent = ic->ic_ifp;
+
+	ic->ic_update_promisc(parent);
+}
+
 /*
  * Block until the parent is in a known state.  This is
  * used after any operations that dispatch a task (e.g.
@@ -1084,7 +1106,9 @@ parent_updown(void *arg, int npending)
 void
 ieee80211_waitfor_parent(struct ieee80211com *ic)
 {
-	taskqueue_drain(taskqueue_thread, &ic->ic_parent_task);
+	taskqueue_drain(ic->ic_tq, &ic->ic_parent_task);
+	taskqueue_drain(ic->ic_tq, &ic->ic_mcast_task);
+	taskqueue_drain(ic->ic_tq, &ic->ic_promisc_task);
 }
 
 /*
@@ -1651,8 +1675,7 @@ ieee80211_new_state_locked(struct ieee80
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ieee80211vap *vp;
 	enum ieee80211_state ostate;
-	int nrunning, nscanning, rc;
-	int forcesync = 0;
+	int forcesync, nrunning, nscanning, rc;
 
 	IEEE80211_LOCK_ASSERT(ic);
 
@@ -1669,6 +1692,7 @@ ieee80211_new_state_locked(struct ieee80
 		}
 	}
 	ostate = vap->iv_state;
+	forcesync = 0;
 	IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE,
 	    "%s: %s -> %s (nrunning %d nscanning %d)\n", __func__,
 	    ieee80211_state_name[ostate], ieee80211_state_name[nstate],

Modified: user/thompsa/vaptq/sys/net80211/ieee80211_scan_sta.c
==============================================================================
--- user/thompsa/vaptq/sys/net80211/ieee80211_scan_sta.c	Sat Feb 28 22:58:52 2009	(r189196)
+++ user/thompsa/vaptq/sys/net80211/ieee80211_scan_sta.c	Sun Mar  1 01:27:58 2009	(r189197)
@@ -32,10 +32,11 @@ __FBSDID("$FreeBSD$");
 #include "opt_wlan.h"
 
 #include <sys/param.h>
-#include <sys/systm.h> 
+#include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
- 
+#include <sys/taskqueue.h>
+
 #include <sys/socket.h>
 
 #include <net/if.h>
@@ -1609,7 +1610,7 @@ ap_force_promisc(struct ieee80211com *ic
 	IEEE80211_LOCK(ic);
 	/* set interface into promiscuous mode */
 	ifp->if_flags |= IFF_PROMISC;
-	ic->ic_update_promisc(ifp);
+	taskqueue_enqueue(ic->ic_tq, &ic->ic_promisc_task);
 	IEEE80211_UNLOCK(ic);
 }
 

Modified: user/thompsa/vaptq/sys/net80211/ieee80211_var.h
==============================================================================
--- user/thompsa/vaptq/sys/net80211/ieee80211_var.h	Sat Feb 28 22:58:52 2009	(r189196)
+++ user/thompsa/vaptq/sys/net80211/ieee80211_var.h	Sun Mar  1 01:27:58 2009	(r189197)
@@ -119,6 +119,8 @@ struct ieee80211com {
 	struct callout		ic_inact;	/* inactivity processing */
 	struct taskqueue	*ic_tq;		/* deferred state thread */
 	struct task		ic_parent_task;	/* deferred parent processing */
+	struct task		ic_promisc_task;/* deferred promisc update */
+	struct task		ic_mcast_task;	/* deferred mcast update */
 
 	uint32_t		ic_flags;	/* state flags */
 	uint32_t		ic_flags_ext;	/* extended state flags */