From owner-svn-src-all@FreeBSD.ORG Tue Feb 12 11:24:38 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 87EED199; Tue, 12 Feb 2013 11:24:38 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 612D6828; Tue, 12 Feb 2013 11:24:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1CBOcbS004666; Tue, 12 Feb 2013 11:24:38 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1CBObXT004663; Tue, 12 Feb 2013 11:24:37 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201302121124.r1CBObXT004663@svn.freebsd.org> From: Gleb Smirnoff Date: Tue, 12 Feb 2013 11:24:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r246710 - head/sys/net80211 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Feb 2013 11:24:38 -0000 Author: glebius Date: Tue Feb 12 11:24:37 2013 New Revision: 246710 URL: http://svnweb.freebsd.org/changeset/base/246710 Log: 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. Modified: head/sys/net80211/ieee80211_freebsd.c head/sys/net80211/ieee80211_input.c head/sys/net80211/ieee80211_mesh.c Modified: head/sys/net80211/ieee80211_freebsd.c ============================================================================== --- head/sys/net80211/ieee80211_freebsd.c Tue Feb 12 10:32:53 2013 (r246709) +++ head/sys/net80211/ieee80211_freebsd.c Tue Feb 12 11:24:37 2013 (r246710) @@ -432,6 +432,7 @@ ieee80211_getmgtframe(uint8_t **frm, int return m; } +#ifndef __NO_STRICT_ALIGNMENT /* * Re-align the payload in the mbuf. This is mainly used (right now) * to handle IP header alignment requirements on certain architectures. @@ -468,6 +469,7 @@ ieee80211_realign(struct ieee80211vap *v m_freem(m); return n; } +#endif /* !__NO_STRICT_ALIGNMENT */ int ieee80211_add_callback(struct mbuf *m, Modified: head/sys/net80211/ieee80211_input.c ============================================================================== --- head/sys/net80211/ieee80211_input.c Tue Feb 12 10:32:53 2013 (r246709) +++ head/sys/net80211/ieee80211_input.c Tue Feb 12 11:24:37 2013 (r246710) @@ -323,13 +323,13 @@ ieee80211_decap(struct ieee80211vap *vap IEEE80211_ADDR_COPY(eh->ether_shost, wh.i_addr4); break; } -#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)); Modified: head/sys/net80211/ieee80211_mesh.c ============================================================================== --- head/sys/net80211/ieee80211_mesh.c Tue Feb 12 10:32:53 2013 (r246709) +++ head/sys/net80211/ieee80211_mesh.c Tue Feb 12 11:24:37 2013 (r246710) @@ -1401,13 +1401,13 @@ mesh_decap(struct ieee80211vap *vap, str 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));