svn commit: r188470 - in projects/vap7/sys: . contrib/pf dev dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5312 dev/ath/ath_hal/ar54...

[Sam Leffler]

Author: sam
Date: Tue Feb 10 23:59:59 2009
New Revision: 188470
URL: http://svn.freebsd.org/changeset/base/188470

Log:
  merge r188466: clean neighbor entries on beacon miss

Modified:
  projects/vap7/sys/   (props changed)
  projects/vap7/sys/contrib/pf/   (props changed)
  projects/vap7/sys/dev/   (props changed)
  projects/vap7/sys/dev/ath/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5210/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5211/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5212/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5312/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5416/   (props changed)
  projects/vap7/sys/dev/cxgb/   (props changed)
  projects/vap7/sys/dev/usb2/   (props changed)
  projects/vap7/sys/i386/conf/USB2   (props changed)
  projects/vap7/sys/modules/usb2/   (props changed)
  projects/vap7/sys/net80211/   (props changed)
  projects/vap7/sys/net80211/ieee80211_adhoc.c

Modified: projects/vap7/sys/net80211/ieee80211_adhoc.c
==============================================================================
--- projects/vap7/sys/net80211/ieee80211_adhoc.c	Tue Feb 10 23:58:00 2009	(r188469)
+++ projects/vap7/sys/net80211/ieee80211_adhoc.c	Tue Feb 10 23:59:59 2009	(r188470)
@@ -110,6 +110,15 @@ adhoc_vattach(struct ieee80211vap *vap)
 #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 @@ adhoc_newstate(struct ieee80211vap *vap,
 		break;
 	case IEEE80211_S_SCAN:
 		switch (ostate) {
-		case IEEE80211_S_INIT:
 		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:
 			if (vap->iv_des_chan != IEEE80211_CHAN_ANYC &&
 			    !IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan)) {
 				/*