From owner-svn-src-projects@FreeBSD.ORG  Tue May 19 15:53:07 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 F17961065676;
	Tue, 19 May 2009 15:53:07 +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 E0A578FC12;
	Tue, 19 May 2009 15:53:07 +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 n4JFr7nL002463;
	Tue, 19 May 2009 15:53:07 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4JFr7hG002460;
	Tue, 19 May 2009 15:53:07 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200905191553.n4JFr7hG002460@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 19 May 2009 15:53:07 +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: r192389 - 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: Tue, 19 May 2009 15:53:08 -0000

Author: rpaulo
Date: Tue May 19 15:53:07 2009
New Revision: 192389
URL: http://svn.freebsd.org/changeset/base/192389

Log:
  Remove the bogus decrease of datalen and pad meshcntl struct instead.
  This is a temporary hack but makes packets flow in the mesh.
  
  Sponsored by:	The  FreeBSD Foundation

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

Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.h	Tue May 19 15:50:36 2009	(r192388)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.h	Tue May 19 15:53:07 2009	(r192389)
@@ -316,6 +316,7 @@ struct ieee80211_meshcntl {
 	uint8_t		mc_flags;
 	uint8_t		mc_ttl;
 	uint32_t	mc_seq;
+	uint16_t	_pad;
 	/* more mesh addresses follow */
 } __packed;
 

Modified: projects/mesh11s/sys/net80211/ieee80211_output.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_output.c	Tue May 19 15:50:36 2009	(r192388)
+++ projects/mesh11s/sys/net80211/ieee80211_output.c	Tue May 19 15:53:07 2009	(r192389)
@@ -1331,7 +1331,7 @@ ieee80211_encap(struct ieee80211vap *vap
 			goto bad;
 	}
 	datalen = m->m_pkthdr.len;		/* NB: w/o 802.11 header */
-	hdrspace -= 2;
+
 	M_PREPEND(m, hdrspace, M_DONTWAIT);
 	if (m == NULL) {
 		vap->iv_stats.is_tx_nobuf++;