From owner-svn-src-projects@FreeBSD.ORG  Thu Jul  2 16:41:46 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BE40E106566C;
	Thu,  2 Jul 2009 16:41:46 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AD8248FC16;
	Thu,  2 Jul 2009 16:41:46 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n62Gfk3v049555;
	Thu, 2 Jul 2009 16:41:46 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n62Gfk7L049553;
	Thu, 2 Jul 2009 16:41:46 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200907021641.n62Gfk7L049553@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Thu, 2 Jul 2009 16:41:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195293 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Jul 2009 16:41:47 -0000

Author: sam
Date: Thu Jul  2 16:41:46 2009
New Revision: 195293
URL: http://svn.freebsd.org/changeset/base/195293

Log:
  we cannot depend on the node address being stable between q and remove;
  use the hash of the mac address instead

Modified:
  projects/mesh11s/sys/net80211/ieee80211_wds.c

Modified: projects/mesh11s/sys/net80211/ieee80211_wds.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_wds.c	Thu Jul  2 16:41:09 2009	(r195292)
+++ projects/mesh11s/sys/net80211/ieee80211_wds.c	Thu Jul  2 16:41:46 2009	(r195293)
@@ -104,7 +104,8 @@ wds_flush(struct ieee80211_node *ni)
 	struct mbuf *m, *next;
 	int8_t rssi, nf;
 
-	m = ieee80211_ageq_remove(&ic->ic_stageq, ni);
+	m = ieee80211_ageq_remove(&ic->ic_stageq,
+	    (void *)(uintptr_t) ieee80211_mac_hash(ic, ni->ni_macaddr));
 	if (m == NULL)
 		return;
 
@@ -325,6 +326,8 @@ ieee80211_dwds_discover(struct ieee80211
 	 * XXX handle overflow?
 	 * XXX per/vap beacon interval?
 	 */
+	m->m_pkthdr.rcvif = (void *)(uintptr_t)
+	    ieee80211_mac_hash(ic, ni->ni_macaddr);
 	(void) ieee80211_ageq_append(&ic->ic_stageq, m,
 	    ((ni->ni_intval * ic->ic_lintval) << 2) / 1024);
 	ieee80211_notify_wds_discover(ni);