Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Jun 2009 22:27:20 +0000 (UTC)
From:      Rui Paulo <rpaulo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r193868 - projects/mesh11s/sys/net80211
Message-ID:  <200906092227.n59MRKSi085933@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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,



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906092227.n59MRKSi085933>