Date: Wed, 8 Jul 2009 13:38:42 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r195450 - projects/mesh11s/sys/net80211 Message-ID: <200907081338.n68DcgnU052555@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rpaulo Date: Wed Jul 8 13:38:42 2009 New Revision: 195450 URL: http://svn.freebsd.org/changeset/base/195450 Log: Fix mismerge. Modified: projects/mesh11s/sys/net80211/ieee80211_input.c Modified: projects/mesh11s/sys/net80211/ieee80211_input.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_input.c Wed Jul 8 13:38:28 2009 (r195449) +++ projects/mesh11s/sys/net80211/ieee80211_input.c Wed Jul 8 13:38:42 2009 (r195450) @@ -277,7 +277,6 @@ ieee80211_decap(struct ieee80211vap *vap IEEE80211_ADDR_COPY(eh->ether_shost, wh.i_addr4); break; } -#define ALIGNED_POINTER(p,t) ((((u_long)(p)) & (sizeof(t)-1)) == 0) #ifdef ALIGNED_POINTER if (!ALIGNED_POINTER(mtod(m, caddr_t) + sizeof(*eh), uint32_t)) { struct mbuf *n, *n0, **np;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907081338.n68DcgnU052555>