From owner-svn-src-stable-10@FreeBSD.ORG  Sat Aug 16 14:17:10 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8C76AC8D;
 Sat, 16 Aug 2014 14:17:10 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 77B4820D9;
 Sat, 16 Aug 2014 14:17:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7GEHAwA065320;
 Sat, 16 Aug 2014 14:17:10 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7GEHAfM065319;
 Sat, 16 Aug 2014 14:17:10 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201408161417.s7GEHAfM065319@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 16 Aug 2014 14:17:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270059 - stable/10/sys/dev/altera/atse
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Aug 2014 14:17:10 -0000

Author: bz
Date: Sat Aug 16 14:17:09 2014
New Revision: 270059
URL: http://svnweb.freebsd.org/changeset/base/270059

Log:
  MFC r264542:
  
   Use ETHER_ALIGN as argument to m_adj() to offset the beginning of packet
   rather than the magic number 2.
  
   While here fix a typo in a comment.
  
   No functional changes.
  
  Sponsored by:	DARPA/AFRL

Modified:
  stable/10/sys/dev/altera/atse/if_atse.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/altera/atse/if_atse.c
==============================================================================
--- stable/10/sys/dev/altera/atse/if_atse.c	Sat Aug 16 14:14:29 2014	(r270058)
+++ stable/10/sys/dev/altera/atse/if_atse.c	Sat Aug 16 14:17:09 2014	(r270059)
@@ -1179,7 +1179,7 @@ outer:
 				return (rx_npkts);
 			m->m_len = m->m_pkthdr.len = MCLBYTES;
 			/* Make sure upper layers will be aligned. */
-			m_adj(m, 2);
+			m_adj(m, ETHER_ALIGN);
 			sc->atse_rx_m = m;
 		}
 
@@ -1815,7 +1815,7 @@ atse_detach(device_t dev)
 	return (0);
 }
 
-/* Shared between nexus anf fdt implementation. */
+/* Shared between nexus and fdt implementation. */
 void
 atse_detach_resources(device_t dev)
 {