From owner-svn-src-projects@FreeBSD.ORG  Fri Jun 26 11:04:44 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 260EC1065673;
	Fri, 26 Jun 2009 11:04: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 150F88FC1C;
	Fri, 26 Jun 2009 11:04:44 +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 n5QB4hbG084442;
	Fri, 26 Jun 2009 11:04:43 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5QB4hqT084440;
	Fri, 26 Jun 2009 11:04:43 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906261104.n5QB4hqT084440@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 26 Jun 2009 11:04: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: r195047 - 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: Fri, 26 Jun 2009 11:04:44 -0000

Author: rpaulo
Date: Fri Jun 26 11:04:43 2009
New Revision: 195047
URL: http://svn.freebsd.org/changeset/base/195047

Log:
  Fixed a bug caused by incorrect parsion of peer link action 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	Fri Jun 26 10:23:17 2009	(r195046)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Jun 26 11:04:43 2009	(r195047)
@@ -873,10 +873,19 @@ mesh_recv_action(struct ieee80211_node *
 				meshpeer = (struct ieee80211_meshpeer_ie *) frm;
 				meshpeer->peer_llinkid =
 				    LE_READ_2(&meshpeer->peer_llinkid);
-				meshpeer->peer_linkid =
-				    LE_READ_2(&meshpeer->peer_linkid);
-				meshpeer->peer_rcode =
-				    LE_READ_2(&meshpeer->peer_rcode);
+				/* NB: peer link ID is opt on these frames */
+				if (meshpeer->peer_subtype ==
+				    IEEE80211_MESH_PEER_LINK_CLOSE &&
+				    meshpeer->peer_len == 5) {
+					meshpeer->peer_rcode =
+					    LE_READ_2(&meshpeer->peer_linkid);
+					meshpeer->peer_linkid = 0;
+				} else {
+					meshpeer->peer_linkid =
+					    LE_READ_2(&meshpeer->peer_linkid);
+					meshpeer->peer_rcode =
+					    LE_READ_2(&meshpeer->peer_rcode);
+				}
 				break;
 			}
 			frm += frm[1] + 2;