From owner-svn-src-projects@FreeBSD.ORG  Wed Jun 17 16:28:02 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 D61E1106568F;
	Wed, 17 Jun 2009 16:28:02 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C523D8FC0C;
	Wed, 17 Jun 2009 16:28:02 +0000 (UTC)
	(envelope-from rpaulo@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 n5HGS2TW081016;
	Wed, 17 Jun 2009 16:28:02 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5HGS2pR081014;
	Wed, 17 Jun 2009 16:28:02 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906171628.n5HGS2pR081014@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Wed, 17 Jun 2009 16:28:02 +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: r194373 - 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: Wed, 17 Jun 2009 16:28:03 -0000

Author: rpaulo
Date: Wed Jun 17 16:28:02 2009
New Revision: 194373
URL: http://svn.freebsd.org/changeset/base/194373

Log:
  Correctly verify the IDs on confirm frames.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Wed Jun 17 16:14:32 2009	(r194372)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Wed Jun 17 16:28:02 2009	(r194373)
@@ -859,7 +859,8 @@ mesh_recv_action(struct ieee80211_node *
 				/* NB: don't setup/clear any timeout */
 				break;
 			case IEEE80211_NODE_MESH_CONFIRMRECV:
-				if (ni->ni_mllid != meshpeer->peer_llinkid) {
+				if (ni->ni_mllid != meshpeer->peer_linkid ||
+				    ni->ni_mlpid != meshpeer->peer_llinkid) {
 					vargs.fixedarg[0] = ni->ni_mllid;
 					vargs.fixedarg[1] = ni->ni_mlpid;
 					vargs.fixedarg[2] =