From owner-p4-projects@FreeBSD.ORG  Wed Dec 29 19:55:28 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9DF1016A4D0; Wed, 29 Dec 2004 19:55:27 +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 59E1116A4CE
	for <perforce@freebsd.org>; Wed, 29 Dec 2004 19:55:27 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4777243D2F
	for <perforce@freebsd.org>; Wed, 29 Dec 2004 19:55:27 +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 iBTJtRNA041761
	for <perforce@freebsd.org>; Wed, 29 Dec 2004 19:55:27 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBTJtRJC041758
	for perforce@freebsd.org; Wed, 29 Dec 2004 19:55:27 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 29 Dec 2004 19:55:27 GMT
Message-Id: <200412291955.iBTJtRJC041758@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 67857 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: Wed, 29 Dec 2004 19:55:28 -0000

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

Change 67857 by sam@sam_ebb on 2004/12/29 19:55:08

	don't setup the station table if it's already there; this
	can happen when an ibss merge takes place

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_node.c#30 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#30 (text+ko) ====

@@ -759,17 +759,20 @@
 			return 0;
 		}
 		/*
-		 * Create the neighbor table.
+		 * Create the neighbor table; it will already
+		 * exist if we are simply switching mastership.
 		 */
-		ic->ic_sta = ieee80211_node_table_alloc(ic,
+		if (ic->ic_sta == NULL) {
+			ic->ic_sta = ieee80211_node_table_alloc(ic,
 					"neighbor", ic->ic_inact_run,
 					ieee80211_timeout_stations);
-		if (ic->ic_sta == NULL) {
-			/*
-			 * Should remain in SCAN state and retry.
-			 */
-			/* XXX stat+msg */
-			return 0;
+			if (ic->ic_sta == NULL) {
+				/*
+				 * Should remain in SCAN state and retry.
+				 */
+				/* XXX stat+msg */
+				return 0;
+			}
 		}
 	}