From owner-p4-projects@FreeBSD.ORG  Fri Jan 21 16:29:23 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 42C7516A4D0; Fri, 21 Jan 2005 16:29:23 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1C61016A4CE
	for <perforce@freebsd.org>; Fri, 21 Jan 2005 16:29:23 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0C01943D1F
	for <perforce@freebsd.org>; Fri, 21 Jan 2005 16:29:23 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0LGTMds082500
	for <perforce@freebsd.org>; Fri, 21 Jan 2005 16:29:22 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0LGTMFa082497
	for perforce@freebsd.org; Fri, 21 Jan 2005 16:29:22 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 21 Jan 2005 16:29:22 GMT
Message-Id: <200501211629.j0LGTMFa082497@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>
Subject: PERFORCE change 69443 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Fri, 21 Jan 2005 16:29:23 -0000

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

Change 69443 by sam@sam_ebb on 2005/01/21 16:29:03

	handle potential stale values of bssid in neighbor nodes that
	can occur after an ibss merge

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_output.c#35 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#35 (text+ko) ====

@@ -580,7 +580,11 @@
 		wh->i_fc[1] = IEEE80211_FC1_DIR_NODS;
 		IEEE80211_ADDR_COPY(wh->i_addr1, eh.ether_dhost);
 		IEEE80211_ADDR_COPY(wh->i_addr2, eh.ether_shost);
-		IEEE80211_ADDR_COPY(wh->i_addr3, ni->ni_bssid);
+		/*
+		 * NB: always use the bssid from ic_bss as the
+		 *     neighbor's may be stale after an ibss merge
+		 */
+		IEEE80211_ADDR_COPY(wh->i_addr3, ic->ic_bss->ni_bssid);
 		break;
 	case IEEE80211_M_HOSTAP:
 		wh->i_fc[1] = IEEE80211_FC1_DIR_FROMDS;