From owner-p4-projects@FreeBSD.ORG  Sun Feb  4 06:52:33 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B51EA16A405; Sun,  4 Feb 2007 06:52:33 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5FD5516A401
	for <perforce@freebsd.org>; Sun,  4 Feb 2007 06:52:33 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 5017713C47E
	for <perforce@freebsd.org>; Sun,  4 Feb 2007 06:52:33 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l146qXmP009516
	for <perforce@freebsd.org>; Sun, 4 Feb 2007 06:52:33 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l146qXUP009499
	for perforce@freebsd.org; Sun, 4 Feb 2007 06:52:33 GMT
	(envelope-from sam@freebsd.org)
Date: Sun, 4 Feb 2007 06:52:33 GMT
Message-Id: <200702040652.l146qXUP009499@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 113981 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, 04 Feb 2007 06:52:34 -0000

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

Change 113981 by sam@sam_ebb on 2007/02/04 06:52:16

	duh, checking ssid is very wrong
	Obtained from:	atheros

Affected files ...

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

Differences ...

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

@@ -519,13 +519,6 @@
 	return ieee80211_sta_join1(ieee80211_ref_node(ni));
 }
 
-static __inline int
-ssid_equal(const struct ieee80211_node *a, const struct ieee80211_node *b)
-{
-	return (a->ni_esslen == b->ni_esslen &&
-		memcmp(a->ni_essid, b->ni_essid, a->ni_esslen) == 0);
-}
-
 /*
  * Join the specified IBSS/BSS network.  The node is assumed to
  * be passed in with a held reference.
@@ -556,11 +549,12 @@
 	 */
 	obss = ic->ic_bss;
 	/*
-	 * Check if old+new node have the same ssid in which
+	 * Check if old+new node have the same address in which
 	 * case we can reassociate when operating in sta mode.
 	 */
 	canreassoc = (obss != NULL &&
-		ic->ic_state == IEEE80211_S_RUN && ssid_equal(obss, selbs));
+		ic->ic_state == IEEE80211_S_RUN &&
+		IEEE80211_ADDR_EQ(obss->ni_macaddr, selbs->ni_macaddr));
 	ic->ic_bss = selbs;		/* NB: caller assumed to bump refcnt */
 	if (obss != NULL) {
 		copy_bss(selbs, obss);