Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 Jun 2009 16:28:02 +0000 (UTC)
From:      Rui Paulo <rpaulo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r194373 - projects/mesh11s/sys/net80211
Message-ID:  <200906171628.n5HGS2pR081014@svn.freebsd.org>

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



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