From owner-svn-src-all@FreeBSD.ORG  Wed Jan 26 16:59:08 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0C8BF1065673;
	Wed, 26 Jan 2011 16:59:08 +0000 (UTC)
	(envelope-from bschmidt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EF6038FC0A;
	Wed, 26 Jan 2011 16:59:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0QGx7LQ083249;
	Wed, 26 Jan 2011 16:59:07 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0QGx7C5083247;
	Wed, 26 Jan 2011 16:59:07 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201101261659.p0QGx7C5083247@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Wed, 26 Jan 2011 16:59:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217885 - stable/8/sys/net80211
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Jan 2011 16:59:08 -0000

Author: bschmidt
Date: Wed Jan 26 16:59:07 2011
New Revision: 217885
URL: http://svn.freebsd.org/changeset/base/217885

Log:
  MFC r217590:
  Jump to the next element and not to an arbitrary point. frm[1] contains
  the element's data length, frm[2] is the first byte of the element's data.
  
  Submitted by:	Monthadar Al Jaberi <monthadar at gmail.com>

Modified:
  stable/8/sys/net80211/ieee80211_mesh.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/net80211/ieee80211_mesh.c
==============================================================================
--- stable/8/sys/net80211/ieee80211_mesh.c	Wed Jan 26 13:18:26 2011	(r217884)
+++ stable/8/sys/net80211/ieee80211_mesh.c	Wed Jan 26 16:59:07 2011	(r217885)
@@ -1461,7 +1461,7 @@ mesh_recv_mgmt(struct ieee80211_node *ni
 				meshid = frm;
 				break;
 			}
-			frm += frm[2] + 2;
+			frm += frm[1] + 2;
 		}
 		IEEE80211_VERIFY_ELEMENT(ssid, IEEE80211_NWID_LEN, return);
 		IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE, return);