PERFORCE change 151547 for review

[Sam Leffler]

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

Change 151547 by sam at sam_ebb on 2008/10/19 07:10:49

	invoke the new assoc callback on joining a bss in sta and adhoc modes

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#17 edit
.. //depot/projects/vap/sys/net80211/ieee80211_sta.c#20 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#17 (text+ko) ====

@@ -208,6 +208,12 @@
 		 */
 		if (ni->ni_authmode != IEEE80211_AUTH_8021X)
 			ieee80211_node_authorize(ni);
+		/*
+		 * Fake association when joining an existing bss.
+		 */
+		if (!IEEE80211_ADDR_EQ(ni->ni_macaddr, vap->iv_myaddr) &&
+		    ic->ic_newassoc != NULL)
+			ic->ic_newassoc(ni, ostate != IEEE80211_S_RUN);
 		break;
 	case IEEE80211_S_SLEEP:
 		ieee80211_sta_pwrsave(vap, 0);

==== //depot/projects/vap/sys/net80211/ieee80211_sta.c#20 (text+ko) ====

@@ -400,6 +400,11 @@
 		 */
 		if (ni->ni_authmode != IEEE80211_AUTH_8021X)
 			ieee80211_node_authorize(ni);
+		/*
+		 * Fake association when joining an existing bss.
+		 */
+		if (ic->ic_newassoc != NULL)
+			ic->ic_newassoc(vap->iv_bss, ostate != IEEE80211_S_RUN);
 		break;
 	case IEEE80211_S_SLEEP:
 		ieee80211_sta_pwrsave(vap, 0);