[src/netbsd-1-5]: src/sys/dev/pcmcia Pull up revision 1.48 (requested by cast...

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

details:   https://anonhg.NetBSD.org/src/rev/3158c2370f15
branches:  netbsd-1-5
changeset: 490507:3158c2370f15
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Thu Jan 25 17:47:08 2001 +0000

description:
Pull up revision 1.48 (requested by castor):
  Ensure the ethernet payload is properly aligned. Fixes PR port-hpcmips/11477.

diffstat:

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

diffs (20 lines):

diff -r 852afa6f715e -r 3158c2370f15 sys/dev/pcmcia/if_wi.c
--- a/sys/dev/pcmcia/if_wi.c    Thu Jan 25 17:44:06 2001 +0000
+++ b/sys/dev/pcmcia/if_wi.c    Thu Jan 25 17:47:08 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wi.c,v 1.21.2.7 2000/10/17 00:56:32 tv Exp $        */
+/*     $NetBSD: if_wi.c,v 1.21.2.8 2001/01/25 17:47:08 jhawk Exp $     */
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -498,6 +498,10 @@
                return;
        }
 
+       /* 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 *);
        m->m_pkthdr.rcvif = ifp;