From owner-svn-src-all@FreeBSD.ORG Sun Jun 24 08:47:20 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 9F571106564A; Sun, 24 Jun 2012 08:47:20 +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 88EF48FC0A; Sun, 24 Jun 2012 08:47:20 +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 q5O8lK9i098504; Sun, 24 Jun 2012 08:47:20 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5O8lK29098498; Sun, 24 Jun 2012 08:47:20 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201206240847.q5O8lK29098498@svn.freebsd.org> From: Adrian Chadd Date: Sun, 24 Jun 2012 08:47:20 +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: r237529 - in head/sys/dev/ath: . ath_dfs/null ath_rate/amrr ath_rate/onoe ath_rate/sample 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: Sun, 24 Jun 2012 08:47:20 -0000 Author: adrian Date: Sun Jun 24 08:47:19 2012 New Revision: 237529 URL: http://svn.freebsd.org/changeset/base/237529 Log: In a complete lack of foresight on my part, my previous commit broke the assumption that ath_softc doesn't change size based on build time configuration. I picked up on this because suddenly radar stuff didn't work; and although the ath_dfs code was setting sc_dodfs=1, the main ath driver saw sc_dodfs=0. So for now, include opt_ath.h in driver source files. This seems like the sane thing to do anyway. I'll have to do a pass over the code at some later stage and turn the radiotap TX/RX structs into malloc'ed memory, rather than in-line inside of ath_softc. I'd rather like to keep ath_softc the same layout regardless of configuration parameters. Pointy hat to: adrian Modified: head/sys/dev/ath/ath_dfs/null/dfs_null.c head/sys/dev/ath/ath_rate/amrr/amrr.c head/sys/dev/ath/ath_rate/onoe/onoe.c head/sys/dev/ath/ath_rate/sample/sample.c head/sys/dev/ath/if_ath_ahb.c Modified: head/sys/dev/ath/ath_dfs/null/dfs_null.c ============================================================================== --- head/sys/dev/ath/ath_dfs/null/dfs_null.c Sun Jun 24 08:43:34 2012 (r237528) +++ head/sys/dev/ath/ath_dfs/null/dfs_null.c Sun Jun 24 08:47:19 2012 (r237529) @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$"); /* * This implements an empty DFS module. */ +#include "opt_ath.h" #include "opt_inet.h" #include "opt_wlan.h" Modified: head/sys/dev/ath/ath_rate/amrr/amrr.c ============================================================================== --- head/sys/dev/ath/ath_rate/amrr/amrr.c Sun Jun 24 08:43:34 2012 (r237528) +++ head/sys/dev/ath/ath_rate/amrr/amrr.c Sun Jun 24 08:47:19 2012 (r237529) @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); * "IEEE 802.11 Rate Adaptation: A Practical Approach" by * Mathieu Lacage, Hossein Manshaei, Thierry Turletti */ +#include "opt_ath.h" #include "opt_inet.h" #include "opt_wlan.h" Modified: head/sys/dev/ath/ath_rate/onoe/onoe.c ============================================================================== --- head/sys/dev/ath/ath_rate/onoe/onoe.c Sun Jun 24 08:43:34 2012 (r237528) +++ head/sys/dev/ath/ath_rate/onoe/onoe.c Sun Jun 24 08:47:19 2012 (r237529) @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); /* * Atsushi Onoe's rate control algorithm. */ +#include "opt_ath.h" #include "opt_inet.h" #include "opt_wlan.h" Modified: head/sys/dev/ath/ath_rate/sample/sample.c ============================================================================== --- head/sys/dev/ath/ath_rate/sample/sample.c Sun Jun 24 08:43:34 2012 (r237528) +++ head/sys/dev/ath/ath_rate/sample/sample.c Sun Jun 24 08:47:19 2012 (r237529) @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); /* * John Bicket's SampleRate control algorithm. */ +#include "opt_ath.h" #include "opt_inet.h" #include "opt_wlan.h" #include "opt_ah.h" Modified: head/sys/dev/ath/if_ath_ahb.c ============================================================================== --- head/sys/dev/ath/if_ath_ahb.c Sun Jun 24 08:43:34 2012 (r237528) +++ head/sys/dev/ath/if_ath_ahb.c Sun Jun 24 08:47:19 2012 (r237529) @@ -35,6 +35,8 @@ __FBSDID("$FreeBSD$"); * AHB bus front-end for the Atheros Wireless LAN controller driver. */ +#include "opt_ath.h" + #include #include #include