From owner-svn-src-projects@FreeBSD.ORG  Fri Jul  3 15:21:57 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 E55EF106564A;
	Fri,  3 Jul 2009 15:21:57 +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 D39908FC15;
	Fri,  3 Jul 2009 15:21:57 +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 n63FLvIC081453;
	Fri, 3 Jul 2009 15:21:57 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n63FLvBm081450;
	Fri, 3 Jul 2009 15:21:57 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200907031521.n63FLvBm081450@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Fri, 3 Jul 2009 15:21:57 +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: r195313 - 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, 03 Jul 2009 15:21:58 -0000

Author: rpaulo
Date: Fri Jul  3 15:21:57 2009
New Revision: 195313
URL: http://svn.freebsd.org/changeset/base/195313

Log:
  Revert previous revision that added +2 to every frm pointer. Do this
  once on action.c.
  
  Sponsored by:	The FreeBSD Foundation

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

Modified: projects/mesh11s/sys/net80211/ieee80211_action.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_action.c	Fri Jul  3 15:13:27 2009	(r195312)
+++ projects/mesh11s/sys/net80211/ieee80211_action.c	Fri Jul  3 15:21:57 2009	(r195313)
@@ -272,6 +272,6 @@ ieee80211_recv_action(struct ieee80211_n
 			f = vendor_recv_action[ia->ia_action];
 		break;
 	}
-	return f(ni, frm, efrm);
+	return f(ni, frm + 2, efrm);
 #undef N
 }

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Jul  3 15:13:27 2009	(r195312)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Fri Jul  3 15:21:57 2009	(r195313)
@@ -1105,8 +1105,7 @@ mesh_recv_action_meshpeering_open(struct
 	uint16_t args[3];
 
 	/* +2 for capabilites */
-	meshpeer = mesh_parse_meshpeering_action(ni, wh,
-	    frm + sizeof(struct ieee80211_action) + 2, efrm, &ie);
+	meshpeer = mesh_parse_meshpeering_action(ni, wh, frm+2, efrm, &ie);
 	if (meshpeer == NULL) {
 		return 0;
 	}
@@ -1240,8 +1239,7 @@ mesh_recv_action_meshpeering_confirm(str
 	uint16_t args[3];
 
 	/* +2+2+2 for capabilites + status code + AID */
-	meshpeer = mesh_parse_meshpeering_action(ni, wh,
-	    frm + sizeof(struct ieee80211_action) + 2 + 2 + 2, efrm, &ie);
+	meshpeer = mesh_parse_meshpeering_action(ni, wh, frm+2+2+2, efrm, &ie);
 	if (meshpeer == NULL) {
 		return 0;
 	}