From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  9 22:27:21 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 54302106566C;
	Tue,  9 Jun 2009 22:27:21 +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 433968FC12;
	Tue,  9 Jun 2009 22:27:21 +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 n59MRKfO085934;
	Tue, 9 Jun 2009 22:27:20 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59MRKSi085933;
	Tue, 9 Jun 2009 22:27:20 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906092227.n59MRKSi085933@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 9 Jun 2009 22:27:20 +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: r193868 - 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: Tue, 09 Jun 2009 22:27:21 -0000

Author: rpaulo
Date: Tue Jun  9 22:27:20 2009
New Revision: 193868
URL: http://svn.freebsd.org/changeset/base/193868

Log:
  fix build errors in previous commit

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

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 22:22:04 2009	(r193867)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Tue Jun  9 22:27:20 2009	(r193868)
@@ -718,12 +718,15 @@ mesh_recv_action(struct ieee80211_node *
 			vap->iv_stats.is_rx_mgtdiscard++;
 			switch (ni->ni_mlstate) {
 			case IEEE80211_NODE_MESH_IDLE:
+			case IEEE80211_NODE_MESH_ESTABLISHED:
+			case IEEE80211_NODE_MESH_HOLDING:
+				/* ignore */
 				break;
 			case IEEE80211_NODE_MESH_OPENSNT:
 			case IEEE80211_NODE_MESH_OPENRCV:
-			case IEEE80211_NODE_MESH_CONFIRMRCV:
-				vargs.fixedarg[0] = ni->ni_mlid;
-				vargs.fixedarg[1] = ni->ni_plid;
+			case IEEE80211_NODE_MESH_CONFIRMRECV:
+				vargs.fixedarg[0] = ni->ni_mllid;
+				vargs.fixedarg[1] = ni->ni_mlpid;
 				vargs.fixedarg[2] =
 				    IEEE80211_REASON_PEER_LINK_CANCELED;
 				ieee80211_send_action(ni,
@@ -882,8 +885,8 @@ mesh_recv_action(struct ieee80211_node *
 			case IEEE80211_NODE_MESH_OPENSNT:
 			case IEEE80211_NODE_MESH_CONFIRMRECV:
 			case IEEE80211_NODE_MESH_ESTABLISHED:
-				vargs.fixedarg[0] = ni->ni_mlid;
-				vargs.fixedarg[1] = 0;
+				vargs.fixedarg[0] = ni->ni_mllid;
+				vargs.fixedarg[1] = ni->ni_mlpid;
 				vargs.fixedarg[2] =
 				    IEEE80211_REASON_MESH_CLOSE_RCVD;
 				ieee80211_send_action(ni,