From owner-p4-projects@FreeBSD.ORG  Mon Mar 17 16:35:47 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 217801065670; Mon, 17 Mar 2008 16:35:47 +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 D54BF106566B
	for <perforce@freebsd.org>; Mon, 17 Mar 2008 16:35:46 +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 C570F8FC2F
	for <perforce@freebsd.org>; Mon, 17 Mar 2008 16:35:46 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2HGZkrA009066
	for <perforce@freebsd.org>; Mon, 17 Mar 2008 16:35:46 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2HGZkVh009064
	for perforce@freebsd.org; Mon, 17 Mar 2008 16:35:46 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 17 Mar 2008 16:35:46 GMT
Message-Id: <200803171635.m2HGZkVh009064@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 137923 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: Mon, 17 Mar 2008 16:35:47 -0000

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

Change 137923 by sam@sam_ebb on 2008/03/17 16:35:19

	unbreak adhoc mode when joining an existing ibss; must program
	the bssid register as otherwise it's left w/ our mac address
	and we don't get unicast frames

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#45 edit

Differences ...

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

@@ -5490,7 +5490,7 @@
 	struct ath_vap *avp = ATH_VAP(vap);
 	struct ath_hal *ah = sc->sc_ah;
 	struct ieee80211_node *ni = NULL;
-	int i, error;
+	int i, error, stamode;
 	u_int32_t rfilt;
 	static const HAL_LED_STATE leds[] = {
 	    HAL_LED_INIT,	/* IEEE80211_S_INIT */
@@ -5524,7 +5524,9 @@
 
 	ni = vap->iv_bss;
 	rfilt = ath_calcrxfilter(sc);
-	if (vap->iv_opmode == IEEE80211_M_STA && nstate == IEEE80211_S_RUN) {
+	stamode = (vap->iv_opmode == IEEE80211_M_STA ||
+		   vap->iv_opmode == IEEE80211_M_IBSS);
+	if (stamode && nstate == IEEE80211_S_RUN) {
 		sc->sc_curaid = ni->ni_associd;
 		IEEE80211_ADDR_COPY(sc->sc_curbssid, ni->ni_bssid);
 		ath_hal_setassocid(ah, sc->sc_curbssid, sc->sc_curaid);