From owner-svn-src-all@FreeBSD.ORG Sun Mar 13 13:05:51 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 2DB8B106564A; Sun, 13 Mar 2011 13:05:51 +0000 (UTC) (envelope-from bschmidt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1C9818FC1F; Sun, 13 Mar 2011 13:05:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2DD5p2S055555; Sun, 13 Mar 2011 13:05:51 GMT (envelope-from bschmidt@svn.freebsd.org) Received: (from bschmidt@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2DD5owf055552; Sun, 13 Mar 2011 13:05:50 GMT (envelope-from bschmidt@svn.freebsd.org) Message-Id: <201103131305.p2DD5owf055552@svn.freebsd.org> From: Bernhard Schmidt Date: Sun, 13 Mar 2011 13:05:50 +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: r219606 - head/sys/net80211 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, 13 Mar 2011 13:05:51 -0000 Author: bschmidt Date: Sun Mar 13 13:05:50 2011 New Revision: 219606 URL: http://svn.freebsd.org/changeset/base/219606 Log: Constantly use MHz instead of Mhz. Pointed out by: N.J. Mann Modified: head/sys/net80211/_ieee80211.h head/sys/net80211/ieee80211_ht.c Modified: head/sys/net80211/_ieee80211.h ============================================================================== --- head/sys/net80211/_ieee80211.h Sun Mar 13 13:00:45 2011 (r219605) +++ head/sys/net80211/_ieee80211.h Sun Mar 13 13:05:50 2011 (r219606) @@ -133,7 +133,7 @@ enum ieee80211_roamingmode { */ struct ieee80211_channel { uint32_t ic_flags; /* see below */ - uint16_t ic_freq; /* setting in Mhz */ + uint16_t ic_freq; /* setting in MHz */ uint8_t ic_ieee; /* IEEE channel number */ int8_t ic_maxregpower; /* maximum regulatory tx power in dBm */ int8_t ic_maxpower; /* maximum tx power in .5 dBm */ Modified: head/sys/net80211/ieee80211_ht.c ============================================================================== --- head/sys/net80211/ieee80211_ht.c Sun Mar 13 13:00:45 2011 (r219605) +++ head/sys/net80211/ieee80211_ht.c Sun Mar 13 13:05:50 2011 (r219606) @@ -380,19 +380,19 @@ ht_announce(struct ieee80211com *ic, int struct ifnet *ifp = ic->ic_ifp; const char *modestr = ieee80211_phymode_name[mode]; - if_printf(ifp, "%s MCS 20Mhz\n", modestr); + if_printf(ifp, "%s MCS 20MHz\n", modestr); ht_rateprint(ic, mode, 0); if (ic->ic_htcaps & IEEE80211_HTCAP_SHORTGI20) { - if_printf(ifp, "%s MCS 20Mhz SGI\n", modestr); + if_printf(ifp, "%s MCS 20MHz SGI\n", modestr); ht_rateprint(ic, mode, 1); } if (ic->ic_htcaps & IEEE80211_HTCAP_CHWIDTH40) { - if_printf(ifp, "%s MCS 40Mhz:\n", modestr); + if_printf(ifp, "%s MCS 40MHz:\n", modestr); ht_rateprint(ic, mode, 2); } if ((ic->ic_htcaps & IEEE80211_HTCAP_CHWIDTH40) && (ic->ic_htcaps & IEEE80211_HTCAP_SHORTGI40)) { - if_printf(ifp, "%s MCS 40Mhz SGI:\n", modestr); + if_printf(ifp, "%s MCS 40MHz SGI:\n", modestr); ht_rateprint(ic, mode, 3); } } @@ -1563,7 +1563,7 @@ ieee80211_ht_updatehtcap(struct ieee8021 htcap_update_shortgi(ni); /* NB: honor operating mode constraint */ - /* XXX 40 MHZ intolerant */ + /* XXX 40 MHz intolerant */ htflags = (vap->iv_flags_ht & IEEE80211_FHT_HT) ? IEEE80211_CHAN_HT20 : 0; if ((ni->ni_htcap & IEEE80211_HTCAP_CHWIDTH40) &&