From 2109203e5b68efeeceae192765c5416bb960dbce Mon Sep 17 00:00:00 2001 From: yongari Date: Thu, 24 Sep 2009 16:57:35 +0000 Subject: Use __NO_STRICT_ALIGNMENT to determine whether de(4) have to apply alignment fixup code for received frames on strict alignment architectures. --- sys/dev/de/if_de.c | 4 ++-- sys/dev/de/if_devar.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'sys/dev/de') diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c index 2acf1a8..a70b219 100644 --- a/sys/dev/de/if_de.c +++ b/sys/dev/de/if_de.c @@ -3488,7 +3488,7 @@ tulip_rx_intr(tulip_softc_t * const sc) struct mbuf *m0; KASSERT(ms != NULL, ("no packet to accept")); -#if defined(TULIP_COPY_RXDATA) +#ifndef __NO_STRICT_ALIGNMENT /* * Copy the data into a new mbuf that is properly aligned. If * we fail to allocate a new mbuf, then drop the packet. We will @@ -3527,7 +3527,7 @@ tulip_rx_intr(tulip_softc_t * const sc) */ ms = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); -#if defined(TULIP_COPY_RXDATA) +#ifndef __NO_STRICT_ALIGNMENT skip_input: #endif if (ms == NULL) { diff --git a/sys/dev/de/if_devar.h b/sys/dev/de/if_devar.h index 3fd3410..d3bc680 100644 --- a/sys/dev/de/if_devar.h +++ b/sys/dev/de/if_devar.h @@ -134,9 +134,6 @@ typedef struct { * architecture which can't handle unaligned accesses) because with * 100Mb/s cards the copying is just too much of a hit. */ -#if !defined(__i386__) -#define TULIP_COPY_RXDATA 1 -#endif #define TULIP_DATA_PER_DESC 2032 #define TULIP_TXTIMER 4 -- cgit v1.1