[src/netbsd-1-5]: src/sys/dev/ic Pull up revision 1.11 (requested by thorpej):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/01231bd424ec
branches:  netbsd-1-5
changeset: 490840:01231bd424ec
user:      he <he%NetBSD.org@localhost>
date:      Sun Mar 11 22:21:06 2001 +0000

description:
Pull up revision 1.11 (requested by thorpej):
  Make sure data after header is aligned, so that this works on
  architectures with strict alignment constraints.  Fixes PR#12356.

diffstat:

 sys/dev/ic/an.c |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r 428280878ae9 -r 01231bd424ec sys/dev/ic/an.c
--- a/sys/dev/ic/an.c   Sun Mar 11 22:18:50 2001 +0000
+++ b/sys/dev/ic/an.c   Sun Mar 11 22:21:06 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: an.c,v 1.5.2.3 2000/12/16 02:21:55 he Exp $    */
+/*     $NetBSD: an.c,v 1.5.2.4 2001/03/11 22:21:06 he Exp $    */
 /*
  * Copyright (c) 1997, 1998, 1999
  *     Bill Paul <wpaul%ctr.columbia.edu@localhost>.  All rights reserved.
@@ -387,6 +387,10 @@
 
        m->m_pkthdr.rcvif = ifp;
 
+       /* Align the data after the ethernet header */
+       m->m_data = (caddr_t) ALIGN(m->m_data + sizeof(struct ether_header)) -
+           sizeof(struct ether_header);
+
        eh = mtod(m, struct ether_header *);
 
 #ifdef ANCACHE