From owner-svn-src-projects@FreeBSD.ORG  Fri Aug 27 21:52:27 2010
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 DECE010656A4;
	Fri, 27 Aug 2010 21:52:27 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CF1B08FC18;
	Fri, 27 Aug 2010 21:52:27 +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 o7RLqRaK008728;
	Fri, 27 Aug 2010 21:52:27 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7RLqRO0008725;
	Fri, 27 Aug 2010 21:52:27 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201008272152.o7RLqRO0008725@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Fri, 27 Aug 2010 21:52:27 +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: r211902 - in projects/sv/sys: net netinet
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, 27 Aug 2010 21:52:28 -0000

Author: attilio
Date: Fri Aug 27 21:52:27 2010
New Revision: 211902
URL: http://svn.freebsd.org/changeset/base/211902

Log:
  Rework the padding by having a 32 bits object and clearing to 0.
  
  Requested by:	emaste

Modified:
  projects/sv/sys/net/netdump_client.c
  projects/sv/sys/netinet/netdump.h

Modified: projects/sv/sys/net/netdump_client.c
==============================================================================
--- projects/sv/sys/net/netdump_client.c	Fri Aug 27 21:52:05 2010	(r211901)
+++ projects/sv/sys/net/netdump_client.c	Fri Aug 27 21:52:27 2010	(r211902)
@@ -618,6 +618,7 @@ retransmit:
 		nd_msg_hdr->type = htonl(type);
 		nd_msg_hdr->offset = htonll(offset+sent_so_far);
 		nd_msg_hdr->len = htonl(pktlen);
+		nd_msg_hdr->_pad = 0;
 
 		if (pktlen) {
 			if ((m2 = m_get(M_DONTWAIT, MT_DATA)) == NULL) {

Modified: projects/sv/sys/netinet/netdump.h
==============================================================================
--- projects/sv/sys/netinet/netdump.h	Fri Aug 27 21:52:05 2010	(r211901)
+++ projects/sv/sys/netinet/netdump.h	Fri Aug 27 21:52:27 2010	(r211902)
@@ -47,7 +47,7 @@ struct netdump_msg_hdr {
 	uint32_t	seqno;	/* Match acks with msgs. */
 	uint64_t	offset;	/* vmcore offset (bytes). */
 	uint32_t	len;	/* Attached data (bytes). */
-	uint8_t		pad[4];	/* Pad space matching 32- and 64-bits archs. */
+	uint32_t	_pad;	/* Pad space matching 32- and 64-bits archs. */
 };
 
 struct netdump_ack {