From owner-svn-src-all@FreeBSD.ORG  Thu Apr  1 16:18:16 2010
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 D58361065672;
	Thu,  1 Apr 2010 16:18:16 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C4B6D8FC20;
	Thu,  1 Apr 2010 16:18:16 +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 o31GIGRa081569;
	Thu, 1 Apr 2010 16:18:16 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o31GIGIl081567;
	Thu, 1 Apr 2010 16:18:16 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201004011618.o31GIGIl081567@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 1 Apr 2010 16:18:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206049 - head/sys/netgraph
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: Thu, 01 Apr 2010 16:18:16 -0000

Author: mav
Date: Thu Apr  1 16:18:16 2010
New Revision: 206049
URL: http://svn.freebsd.org/changeset/base/206049

Log:
  Remove alignment constraints.

Modified:
  head/sys/netgraph/ng_deflate.c

Modified: head/sys/netgraph/ng_deflate.c
==============================================================================
--- head/sys/netgraph/ng_deflate.c	Thu Apr  1 15:37:38 2010	(r206048)
+++ head/sys/netgraph/ng_deflate.c	Thu Apr  1 16:18:16 2010	(r206049)
@@ -36,6 +36,7 @@
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
+#include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
 
@@ -505,8 +506,8 @@ ng_deflate_compress(node_p node, struct 
 		priv->stats.OutOctets+=inlen;
 	} else {
 		/* Install header. */
-		((u_int16_t *)priv->outbuf)[0] = htons(PROT_COMPD);
-		((u_int16_t *)priv->outbuf)[1] = htons(priv->seqnum);
+		be16enc(priv->outbuf, PROT_COMPD);
+		be16enc(priv->outbuf + 2, priv->seqnum);
 
 		/* Return packet in an mbuf. */
 		m_copyback(m, 0, outlen, (caddr_t)priv->outbuf);
@@ -568,7 +569,7 @@ ng_deflate_decompress(node_p node, struc
 		proto = priv->inbuf[0];
 		offset = 1;
 	} else {
-		proto = ntohs(((uint16_t *)priv->inbuf)[0]);
+		proto = be16dec(priv->inbuf);
 		offset = 2;
 	}
 
@@ -579,7 +580,7 @@ ng_deflate_decompress(node_p node, struc
 		priv->stats.FramesComp++;
 
 		/* Check sequence number. */
-		rseqnum = ntohs(((uint16_t *)(priv->inbuf + offset))[0]);
+		rseqnum = be16dec(priv->inbuf + offset);
 		offset += 2;
 		if (rseqnum != priv->seqnum) {
 			priv->stats.Errors++;