From owner-svn-src-projects@FreeBSD.ORG  Sun Jun 21 16:23: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 0E0C610656C1;
	Sun, 21 Jun 2009 16:23:44 +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 F04EA8FC19;
	Sun, 21 Jun 2009 16:23:43 +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 n5LGNhtm012114;
	Sun, 21 Jun 2009 16:23:43 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5LGNhXQ012112;
	Sun, 21 Jun 2009 16:23:43 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906211623.n5LGNhXQ012112@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Sun, 21 Jun 2009 16:23:43 +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: r194592 - 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: Sun, 21 Jun 2009 16:23:46 -0000

Author: rpaulo
Date: Sun Jun 21 16:23:43 2009
New Revision: 194592
URL: http://svn.freebsd.org/changeset/base/194592

Log:
  Fix another edge case.
  
  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	Sun Jun 21 16:11:40 2009	(r194591)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Sun Jun 21 16:23:43 2009	(r194592)
@@ -986,8 +986,8 @@ mesh_recv_action(struct ieee80211_node *
 				    vargs);
 				break;
 			case IEEE80211_NODE_MESH_HOLDING:
-				vargs.fixedarg[0] = ni->ni_mllid;
-				vargs.fixedarg[1] = ni->ni_mlpid;
+				vargs.fixedarg[0] = ni->ni_mlpid;
+				vargs.fixedarg[1] = meshpeer->peer_llinkid;
 				vargs.fixedarg[2] =
 				    IEEE80211_REASON_MESH_MAX_RETRIES;
 				ieee80211_send_action(ni,