From owner-svn-src-all@FreeBSD.ORG Sat Jan 7 20:13:55 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D7E36106566B; Sat, 7 Jan 2012 20:13:55 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C3B628FC0A; Sat, 7 Jan 2012 20:13:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q07KDt8a054820; Sat, 7 Jan 2012 20:13:55 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q07KDtiG054818; Sat, 7 Jan 2012 20:13:55 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201201072013.q07KDtiG054818@svn.freebsd.org> From: Adrian Chadd Date: Sat, 7 Jan 2012 20:13:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r229790 - head/sys/dev/ath/ath_hal X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Sat, 07 Jan 2012 20:13:55 -0000 Author: adrian Date: Sat Jan 7 20:13:55 2012 New Revision: 229790 URL: http://svn.freebsd.org/changeset/base/229790 Log: Commit a temporary workaround for people who are building kernels where they've disabled all the wireless devices/framework. This is just a build workaround. If you're actively using wireless, you must still define AH_SUPPORT_AR5416 as I'm not sure what else will break! The real solution is to make the module build depend if AH_SUPPORT_AR5416 is defined, as well as make the 11n code in if_ath_tx.c and if_ath_tx_ht.c completely optional (maybe depend upon ATH_SUPPORT_11N.) Modified: head/sys/dev/ath/ath_hal/ah_desc.h Modified: head/sys/dev/ath/ath_hal/ah_desc.h ============================================================================== --- head/sys/dev/ath/ath_hal/ah_desc.h Sat Jan 7 19:38:26 2012 (r229789) +++ head/sys/dev/ath/ath_hal/ah_desc.h Sat Jan 7 20:13:55 2012 (r229790) @@ -23,6 +23,17 @@ #include "opt_ah.h" /* NB: required for AH_SUPPORT_AR5416 */ /* + * For now, define this for the structure definitions. + * Because of how the HAL / driver module currently builds, + * it's not very feasible to build the module without + * this defined. The rest of the code (eg in the driver + * body) can work fine with these fields being uninitialised; + * they'll be initialised to 0 anyway. + */ + +#define AH_SUPPORT_AR5416 1 + +/* * Transmit descriptor status. This structure is filled * in only after the tx descriptor process method finds a * ``done'' descriptor; at which point it returns something