PERFORCE change 157604 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Thu Feb 12 11:08:22 PST 2009
http://perforce.freebsd.org/chv.cgi?CH=157604
Change 157604 by hselasky at hselasky_laptop001 on 2009/02/12 19:07:28
net80211 IFC @ 157603
Affected files ...
.. //depot/projects/usb/src/sys/net80211/ieee80211.c#15 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_adhoc.c#5 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#17 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_node.c#16 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_proto.c#14 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_proto.h#10 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_tdma.c#3 integrate
.. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#15 integrate
Differences ...
==== //depot/projects/usb/src/sys/net80211/ieee80211.c#15 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.62 2009/02/03 22:32:26 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.63 2009/02/12 18:57:18 thompsa Exp $");
/*
* IEEE 802.11 generic handler
@@ -289,9 +289,9 @@
struct ifnet *ifp = ic->ic_ifp;
struct ieee80211vap *vap;
- /* XXX ieee80211_stop_all? */
while ((vap = TAILQ_FIRST(&ic->ic_vaps)) != NULL)
ieee80211_vap_destroy(vap);
+ ieee80211_waitfor_parent(ic);
ieee80211_sysctl_detach(ic);
ieee80211_regdomain_detach(ic);
==== //depot/projects/usb/src/sys/net80211/ieee80211_adhoc.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
#include <sys/cdefs.h>
#ifdef __FreeBSD__
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_adhoc.c,v 1.8 2009/01/08 17:12:47 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_adhoc.c,v 1.9 2009/02/10 23:51:18 sam Exp $");
#endif
/*
@@ -110,6 +110,15 @@
#endif
}
+static void
+sta_leave(void *arg, struct ieee80211_node *ni)
+{
+ struct ieee80211vap *vap = arg;
+
+ if (ni->ni_vap == vap && ni != vap->iv_bss)
+ ieee80211_node_leave(ni);
+}
+
/*
* IEEE80211_M_IBSS+IEEE80211_M_AHDEMO vap state machine handler.
*/
@@ -146,8 +155,11 @@
break;
case IEEE80211_S_SCAN:
switch (ostate) {
+ case IEEE80211_S_RUN: /* beacon miss */
+ /* purge station table; entries are stale */
+ ieee80211_iterate_nodes(&ic->ic_sta, sta_leave, vap);
+ /* fall thru... */
case IEEE80211_S_INIT:
- case IEEE80211_S_RUN: /* beacon miss */
if (vap->iv_des_chan != IEEE80211_CHAN_ANYC &&
!IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan)) {
/*
==== //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#17 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.76 2009/01/28 18:39:23 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.77 2009/02/12 18:57:18 thompsa Exp $");
/*
* IEEE 802.11 ioctl support (FreeBSD-specific)
@@ -3265,7 +3265,7 @@
}
IEEE80211_UNLOCK(ic);
/* Wait for parent ioctl handler if it was queued */
- taskqueue_drain(taskqueue_thread, &ic->ic_parent_task);
+ ieee80211_waitfor_parent(ic);
break;
case SIOCADDMULTI:
case SIOCDELMULTI:
==== //depot/projects/usb/src/sys/net80211/ieee80211_node.c#16 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.118 2009/01/29 23:11:18 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.119 2009/02/11 18:40:09 sam Exp $");
#include "opt_wlan.h"
@@ -1719,8 +1719,8 @@
if (nt->nt_keyixmap != NULL && keyix < nt->nt_keyixmax &&
nt->nt_keyixmap[keyix] == ni) {
IEEE80211_DPRINTF(ni->ni_vap, IEEE80211_MSG_NODE,
- "%s: %p<%s> clear key map entry\n",
- __func__, ni, ether_sprintf(ni->ni_macaddr));
+ "%s: %p<%s> clear key map entry %u\n",
+ __func__, ni, ether_sprintf(ni->ni_macaddr), keyix);
nt->nt_keyixmap[keyix] = NULL;
ieee80211_node_decref(ni); /* NB: don't need free */
}
@@ -1763,8 +1763,7 @@
*/
_ieee80211_free_node(ni);
nt = NULL;
- } else if (ieee80211_node_refcnt(ni) == 1 &&
- nt->nt_keyixmap != NULL) {
+ } else if (ieee80211_node_refcnt(ni) == 1 && nt->nt_keyixmap != NULL) {
ieee80211_keyix keyix;
/*
* Check for a last reference in the key mapping table.
@@ -1774,8 +1773,8 @@
nt->nt_keyixmap[keyix] == ni) {
IEEE80211_DPRINTF(ni->ni_vap,
IEEE80211_MSG_NODE,
- "%s: %p<%s> clear key map entry", __func__,
- ni, ether_sprintf(ni->ni_macaddr));
+ "%s: %p<%s> clear key map entry %u", __func__,
+ ni, ether_sprintf(ni->ni_macaddr), keyix);
nt->nt_keyixmap[keyix] = NULL;
ieee80211_node_decref(ni); /* XXX needed? */
_ieee80211_free_node(ni);
==== //depot/projects/usb/src/sys/net80211/ieee80211_proto.c#14 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_proto.c,v 1.51 2008/12/18 23:00:09 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_proto.c,v 1.52 2009/02/12 18:57:18 thompsa Exp $");
/*
* IEEE 802.11 protocol support.
@@ -1072,6 +1072,17 @@
}
/*
+ * Block until the parent is in a known state. This is
+ * used after any operations that dispatch a task (e.g.
+ * to auto-configure the parent device up/down).
+ */
+void
+ieee80211_waitfor_parent(struct ieee80211com *ic)
+{
+ taskqueue_drain(taskqueue_thread, &ic->ic_parent_task);
+}
+
+/*
* Start a vap running. If this is the first vap to be
* set running on the underlying device then we
* automatically bring the device up.
@@ -1258,6 +1269,8 @@
ieee80211_stop_locked(vap);
}
IEEE80211_UNLOCK(ic);
+
+ ieee80211_waitfor_parent(ic);
}
/*
@@ -1278,6 +1291,8 @@
}
}
IEEE80211_UNLOCK(ic);
+
+ ieee80211_waitfor_parent(ic);
}
/*
==== //depot/projects/usb/src/sys/net80211/ieee80211_proto.h#10 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/net80211/ieee80211_proto.h,v 1.34 2009/01/08 17:12:47 sam Exp $
+ * $FreeBSD: src/sys/net80211/ieee80211_proto.h,v 1.35 2009/02/12 18:57:18 thompsa Exp $
*/
#ifndef _NET80211_IEEE80211_PROTO_H_
#define _NET80211_IEEE80211_PROTO_H_
@@ -260,6 +260,7 @@
return tid;
}
+void ieee80211_waitfor_parent(struct ieee80211com *);
void ieee80211_start_locked(struct ieee80211vap *);
void ieee80211_init(void *);
void ieee80211_start_all(struct ieee80211com *);
==== //depot/projects/usb/src/sys/net80211/ieee80211_tdma.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
#include <sys/cdefs.h>
#ifdef __FreeBSD__
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_tdma.c,v 1.2 2009/01/29 23:12:06 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_tdma.c,v 1.4 2009/02/11 17:30:36 sam Exp $");
#endif
/*
@@ -173,6 +173,15 @@
setackpolicy(vap->iv_ic, 0); /* enable ACK's */
}
+static void
+sta_leave(void *arg, struct ieee80211_node *ni)
+{
+ struct ieee80211vap *vap = arg;
+
+ if (ni->ni_vap == vap && ni != vap->iv_bss)
+ ieee80211_node_leave(ni);
+}
+
/*
* TDMA state machine handler.
*/
@@ -180,10 +189,11 @@
tdma_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
{
struct ieee80211_tdma_state *ts = vap->iv_tdma;
+ struct ieee80211com *ic = vap->iv_ic;
enum ieee80211_state ostate;
int status;
- IEEE80211_LOCK_ASSERT(vap->iv_ic);
+ IEEE80211_LOCK_ASSERT(ic);
ostate = vap->iv_state;
IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s -> %s (%d)\n",
@@ -201,6 +211,10 @@
*/
vap->iv_state = nstate; /* state transition */
ieee80211_cancel_scan(vap); /* background scan */
+ if (ostate == IEEE80211_S_RUN) {
+ /* purge station table; entries are stale */
+ ieee80211_iterate_nodes(&ic->ic_sta, sta_leave, vap);
+ }
if (vap->iv_flags_ext & IEEE80211_FEXT_SCANREQ) {
ieee80211_check_scan(vap,
vap->iv_scanreq_flags,
@@ -326,7 +340,6 @@
* Count beacon frame for s/w bmiss handling.
*/
vap->iv_swbmiss_count++;
- vap->iv_bmiss_count = 0;
/*
* Process tdma ie. The contents are used to sync
* the slot timing, reconfigure the bss, etc.
==== //depot/projects/usb/src/sys/net80211/ieee80211_var.h#15 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/net80211/ieee80211_var.h,v 1.69 2009/01/27 23:19:36 sam Exp $
+ * $FreeBSD: src/sys/net80211/ieee80211_var.h,v 1.71 2009/02/11 18:39:20 sam Exp $
*/
#ifndef _NET80211_IEEE80211_VAR_H_
#define _NET80211_IEEE80211_VAR_H_
@@ -720,10 +720,10 @@
#define IEEE80211_MSG_ANY 0xffffffff /* anything */
#define IEEE80211_MSG_BITS \
- "\20\3IOCTL\4WDS\5ACTION\6RATECTL\7ROAM\10INACT\11DOTH\12SUPERG" \
- "\13WME\14ACL\15WPA\16RADKEYS\17RADDUMP\20RADIUS\21DOT1X\22POWER" \
- "\23STATE\24OUTPUT\25SCAN\26AUTH\27ASSOC\30NODE\31ELEMID\32XRATE" \
- "\33INPUT\34CRYPTO\35DUPMPKTS\36DEBUG\3711N"
+ "\20\2TDMA\3IOCTL\4WDS\5ACTION\6RATECTL\7ROAM\10INACT\11DOTH\12SUPERG" \
+ "\13WME\14ACL\15WPA\16RADKEYS\17RADDUMP\20RADIUS\21DOT1XSM\22DOT1X" \
+ "\23POWER\24STATE\25OUTPUT\26SCAN\27AUTH\30ASSOC\31NODE\32ELEMID" \
+ "\33XRATE\34INPUT\35CRYPTO\36DUPMPKTS\37DEBUG\04011N"
#ifdef IEEE80211_DEBUG
#define ieee80211_msg(_vap, _m) ((_vap)->iv_debug & (_m))
More information about the p4-projects
mailing list