From owner-svn-src-all@FreeBSD.ORG Fri Apr 19 06:59:11 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 3AF4648D; Fri, 19 Apr 2013 06:59:11 +0000 (UTC) (envelope-from adrian@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 2C8D8C3C; Fri, 19 Apr 2013 06:59:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3J6xBHO091782; Fri, 19 Apr 2013 06:59:11 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3J6xABE091780; Fri, 19 Apr 2013 06:59:10 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201304190659.r3J6xABE091780@svn.freebsd.org> From: Adrian Chadd Date: Fri, 19 Apr 2013 06:59:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r249639 - head/sys/dev/ath 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: Fri, 19 Apr 2013 06:59:11 -0000 Author: adrian Date: Fri Apr 19 06:59:10 2013 New Revision: 249639 URL: http://svnweb.freebsd.org/changeset/base/249639 Log: Use uint32_t for fields that are fetched via ath_hal_getcapability(). Modified: head/sys/dev/ath/if_ath.c head/sys/dev/ath/if_athvar.h Modified: head/sys/dev/ath/if_ath.c ============================================================================== --- head/sys/dev/ath/if_ath.c Fri Apr 19 05:50:57 2013 (r249638) +++ head/sys/dev/ath/if_ath.c Fri Apr 19 06:59:10 2013 (r249639) @@ -739,7 +739,7 @@ ath_attach(u_int16_t devid, struct ath_s */ if (ath_hal_getcapability(ah, HAL_CAP_HT, 0, NULL) == HAL_OK && (wmodes & (HAL_MODE_HT20 | HAL_MODE_HT40))) { - int rxs, txs; + uint32_t rxs, txs; device_printf(sc->sc_dev, "[HT] enabling HT modes\n"); Modified: head/sys/dev/ath/if_athvar.h ============================================================================== --- head/sys/dev/ath/if_athvar.h Fri Apr 19 05:50:57 2013 (r249638) +++ head/sys/dev/ath/if_athvar.h Fri Apr 19 06:59:10 2013 (r249639) @@ -772,11 +772,11 @@ struct ath_softc { u_int32_t sc_avgtsfdeltap;/* TDMA slot adjust (+) */ u_int32_t sc_avgtsfdeltam;/* TDMA slot adjust (-) */ uint16_t *sc_eepromdata; /* Local eeprom data, if AR9100 */ - int sc_txchainmask; /* hardware TX chainmask */ - int sc_rxchainmask; /* hardware RX chainmask */ - int sc_cur_txchainmask; /* currently configured TX chainmask */ - int sc_cur_rxchainmask; /* currently configured RX chainmask */ - int sc_rts_aggr_limit; /* TX limit on RTS aggregates */ + uint32_t sc_txchainmask; /* hardware TX chainmask */ + uint32_t sc_rxchainmask; /* hardware RX chainmask */ + uint32_t sc_cur_txchainmask; /* currently configured TX chainmask */ + uint32_t sc_cur_rxchainmask; /* currently configured RX chainmask */ + uint32_t sc_rts_aggr_limit; /* TX limit on RTS aggregates */ int sc_aggr_limit; /* TX limit on all aggregates */ int sc_delim_min_pad; /* Minimum delimiter count */