summaryrefslogtreecommitdiffstats
path: root/sys/net80211/ieee80211_mesh.c
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2013-02-12 11:24:37 +0000
committerglebius <glebius@FreeBSD.org>2013-02-12 11:24:37 +0000
commitf03c14c9a708d07642aeda3b27633b69e27e413f (patch)
tree9f43f7b239d3da24bbf04b72c80ab6f3f275d321 /sys/net80211/ieee80211_mesh.c
parent230643b5db9e9c68d92abc57ce7cec955466e46e (diff)
downloadFreeBSD-src-f03c14c9a708d07642aeda3b27633b69e27e413f.zip
FreeBSD-src-f03c14c9a708d07642aeda3b27633b69e27e413f.tar.gz
Substitute '#ifdef ALIGNED_POINTER' with '#ifndef __NO_STRICT_ALIGNMENT',
since the former is defined everywhere. This cuts off some code not necessary on non strict aligment arches. Reviewed by: adrian Sponsored by: Nginx, Inc.
Diffstat (limited to 'sys/net80211/ieee80211_mesh.c')
-rw-r--r--sys/net80211/ieee80211_mesh.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_mesh.c b/sys/net80211/ieee80211_mesh.c
index 6d323cd..f4f94d1 100644
--- a/sys/net80211/ieee80211_mesh.c
+++ b/sys/net80211/ieee80211_mesh.c
@@ -1401,13 +1401,13 @@ mesh_decap(struct ieee80211vap *vap, struct mbuf *m, int hdrlen, int meshdrlen)
return NULL;
}
}
-#ifdef ALIGNED_POINTER
+#ifndef __NO_STRICT_ALIGNMENT
if (!ALIGNED_POINTER(mtod(m, caddr_t) + sizeof(*eh), uint32_t)) {
m = ieee80211_realign(vap, m, sizeof(*eh));
if (m == NULL)
return NULL;
}
-#endif /* ALIGNED_POINTER */
+#endif /* !__NO_STRICT_ALIGNMENT */
if (llc != NULL) {
eh = mtod(m, struct ether_header *);
eh->ether_type = htons(m->m_pkthdr.len - sizeof(*eh));
OpenPOWER on IntegriCloud