summaryrefslogtreecommitdiff
path: root/sys/net80211/ieee80211_input.c
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-07-29 11:31:48 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-07-29 11:31:48 +0000
commit212e214c0835342420aa4174351f59c591fade37 (patch)
tree20963c2d330e77d0dde472c3905a7c635605c0e9 /sys/net80211/ieee80211_input.c
parentffec9e70c2a081dd1b7484b634805011fe883d2b (diff)
ALIGNED_POINTER is always defined.
Diffstat (limited to 'sys/net80211/ieee80211_input.c')
-rw-r--r--sys/net80211/ieee80211_input.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index 568b662dd0b..15a7be81815 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -1,5 +1,5 @@
/* $NetBSD: ieee80211_input.c,v 1.24 2004/05/31 11:12:24 dyoung Exp $ */
-/* $OpenBSD: ieee80211_input.c,v 1.18 2006/06/27 20:55:51 reyk Exp $ */
+/* $OpenBSD: ieee80211_input.c,v 1.19 2006/07/29 11:31:47 miod Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
@@ -496,7 +496,6 @@ ieee80211_decap(struct ifnet *ifp, struct mbuf *m)
m_freem(m);
return NULL;
}
-#ifdef ALIGNED_POINTER
if (!ALIGNED_POINTER(mtod(m, caddr_t) + sizeof(*eh), u_int32_t)) {
struct mbuf *n, *n0, **np;
caddr_t newdata;
@@ -546,7 +545,6 @@ ieee80211_decap(struct ifnet *ifp, struct mbuf *m)
m_freem(m);
m = n0;
}
-#endif /* ALIGNED_POINTER */
if (llc != NULL) {
eh = mtod(m, struct ether_header *);
eh->ether_type = htons(m->m_pkthdr.len - sizeof(*eh));