From owner-p4-projects@FreeBSD.ORG  Sun Oct 19 07:11:21 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5D7BD1065690; Sun, 19 Oct 2008 07:11:21 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 215CE106568A
	for <perforce@freebsd.org>; Sun, 19 Oct 2008 07:11:21 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 104D28FC34
	for <perforce@freebsd.org>; Sun, 19 Oct 2008 07:11:21 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9J7BKnU042697
	for <perforce@freebsd.org>; Sun, 19 Oct 2008 07:11:20 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9J7BKTg042695
	for perforce@freebsd.org; Sun, 19 Oct 2008 07:11:20 GMT
	(envelope-from sam@freebsd.org)
Date: Sun, 19 Oct 2008 07:11:20 GMT
Message-Id: <200810190711.m9J7BKTg042695@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 151547 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Oct 2008 07:11:21 -0000

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

Change 151547 by sam@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);