From owner-svn-src-all@FreeBSD.ORG Mon Dec 26 05:26:36 2011 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 E46241065673; Mon, 26 Dec 2011 05:26:35 +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 C8F108FC18; Mon, 26 Dec 2011 05:26:35 +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 pBQ5QZku091215; Mon, 26 Dec 2011 05:26:35 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBQ5QZIB091213; Mon, 26 Dec 2011 05:26:35 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201112260526.pBQ5QZIB091213@svn.freebsd.org> From: Adrian Chadd Date: Mon, 26 Dec 2011 05:26:35 +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: r228886 - head/sys/dev/ath 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: Mon, 26 Dec 2011 05:26:36 -0000 Author: adrian Date: Mon Dec 26 05:26:35 2011 New Revision: 228886 URL: http://svn.freebsd.org/changeset/base/228886 Log: Do a quick style(9) pass of some of the code introduced with 802.11n support. Modified: head/sys/dev/ath/if_ath.c Modified: head/sys/dev/ath/if_ath.c ============================================================================== --- head/sys/dev/ath/if_ath.c Mon Dec 26 03:14:37 2011 (r228885) +++ head/sys/dev/ath/if_ath.c Mon Dec 26 05:26:35 2011 (r228886) @@ -299,7 +299,8 @@ ath_attach(u_int16_t devid, struct ath_s if_initname(ifp, device_get_name(sc->sc_dev), device_get_unit(sc->sc_dev)); - ah = ath_hal_attach(devid, sc, sc->sc_st, sc->sc_sh, sc->sc_eepromdata, &status); + ah = ath_hal_attach(devid, sc, sc->sc_st, sc->sc_sh, + sc->sc_eepromdata, &status); if (ah == NULL) { if_printf(ifp, "unable to attach hardware; HAL status %u\n", status); @@ -469,7 +470,8 @@ ath_attach(u_int16_t devid, struct ath_s /* Attach DFS module */ if (! ath_dfs_attach(sc)) { - device_printf(sc->sc_dev, "%s: unable to attach DFS\n", __func__); + device_printf(sc->sc_dev, + "%s: unable to attach DFS\n", __func__); error = EIO; goto bad2; } @@ -521,7 +523,7 @@ ath_attach(u_int16_t devid, struct ath_s | IEEE80211_C_BGSCAN /* capable of bg scanning */ | IEEE80211_C_TXFRAG /* handle tx frags */ #ifdef ATH_ENABLE_DFS - | IEEE80211_C_DFS /* Enable DFS radar detection */ + | IEEE80211_C_DFS /* Enable radar detection */ #endif ; /* @@ -633,11 +635,12 @@ ath_attach(u_int16_t devid, struct ath_s int rxs, txs; device_printf(sc->sc_dev, "[HT] enabling HT modes\n"); - ic->ic_htcaps = IEEE80211_HTC_HT /* HT operation */ - | IEEE80211_HTC_AMPDU /* A-MPDU tx/rx */ - | IEEE80211_HTC_AMSDU /* A-MSDU tx/rx */ - | IEEE80211_HTCAP_MAXAMSDU_3839 /* max A-MSDU length */ - | IEEE80211_HTCAP_SMPS_OFF; /* SM power save off */ + ic->ic_htcaps = IEEE80211_HTC_HT /* HT operation */ + | IEEE80211_HTC_AMPDU /* A-MPDU tx/rx */ + | IEEE80211_HTC_AMSDU /* A-MSDU tx/rx */ + | IEEE80211_HTCAP_MAXAMSDU_3839 + /* max A-MSDU length */ + | IEEE80211_HTCAP_SMPS_OFF; /* SM power save off */ ; /* @@ -658,8 +661,8 @@ ath_attach(u_int16_t devid, struct ath_s | IEEE80211_HTCAP_SHORTGI40; /* - * rx/tx stream is not currently used anywhere; it needs to be taken - * into account when negotiating which MCS rates it'll receive and + * TX/RX streams need to be taken into account when + * negotiating which MCS rates it'll receive and * what MCS rates are available for TX. */ (void) ath_hal_getcapability(ah, HAL_CAP_STREAMS, 0, &rxs); @@ -671,7 +674,8 @@ ath_attach(u_int16_t devid, struct ath_s ic->ic_txstream = txs; ic->ic_rxstream = rxs; - device_printf(sc->sc_dev, "[HT] %d RX streams; %d TX streams\n", rxs, txs); + device_printf(sc->sc_dev, + "[HT] %d RX streams; %d TX streams\n", rxs, txs); } #endif @@ -683,7 +687,8 @@ ath_attach(u_int16_t devid, struct ath_s ath_hal_getcapability(ah, HAL_CAP_SERIALISE_WAR, 0, NULL) == HAL_OK) { sc->sc_ah->ah_config.ah_serialise_reg_war = 1; - device_printf(sc->sc_dev, "Enabling register serialisation\n"); + device_printf(sc->sc_dev, + "Enabling register serialisation\n"); } /*