PERFORCE change 68511 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=68511

Change 68511 by sam at sam_ebb on 2005/01/08 00:17:59

	save untested fix for adhoc mode

Affected files ...

.. //depot/projects/wifi/sys/dev/ath/if_ath.c#62 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ath/if_ath.c#62 (text+ko) ====

@@ -2798,8 +2798,18 @@
 			 * is determined by the tsf.
 			 */
 			if (le64toh(ni->ni_tstamp.tsf) >= tsf &&
-			    ieee80211_ibss_merge(ic, ni))
+			    ieee80211_ibss_merge(ic, ni)) {
+				/*
+				 * XXX rather than handle this here it's
+				 *     probably better to do it at the 802.11
+				 *     layer through the state machine so,
+				 *     we can switch channel, etc.
+				 */
+				/* XXX adopt beacon interval and ATIM window */
 				ath_hal_setassocid(ah, ic->ic_bss->ni_bssid, 0);
+				ath_hal_stoptxdma(ah, sc->sc_bhalq);
+				ath_beacon_config(sc);
+			}
 		}
 		break;
 	}