From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 22:34:37 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 D8FE9106566C;
	Thu,  4 Jun 2009 22:34:37 +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 C7C378FC0A;
	Thu,  4 Jun 2009 22:34:37 +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 n54MYbK7006522;
	Thu, 4 Jun 2009 22:34:37 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54MYbPW006521;
	Thu, 4 Jun 2009 22:34:37 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200906042234.n54MYbPW006521@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Thu, 4 Jun 2009 22:34:37 +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: r193471 - 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: Thu, 04 Jun 2009 22:34:38 -0000

Author: rpaulo
Date: Thu Jun  4 22:34:37 2009
New Revision: 193471
URL: http://svn.freebsd.org/changeset/base/193471

Log:
  Revert previous bit that shouldn't go in.

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

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c	Thu Jun  4 22:33:12 2009	(r193470)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c	Thu Jun  4 22:34:37 2009	(r193471)
@@ -284,7 +284,7 @@ mesh_input(struct ieee80211_node *ni, st
 		}	
 		/* NB: not ieee80211_hdrspace, datapad is not honored */
 		hdrlen = ieee80211_hdrsize(wh)
-		    + sizeof(struct ieee80211_meshcntl) + 2;
+		    + sizeof(struct ieee80211_meshcntl);
 		if (m->m_len < hdrlen &&
 		    (m = m_pullup(m, hdrlen)) == NULL) {
 			IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,