From owner-svn-src-all@freebsd.org Mon Aug 17 16:29:01 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 34FB43B6893; Mon, 17 Aug 2020 16:29:01 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BVfcs0j36z3dQh; Mon, 17 Aug 2020 16:29:01 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F1008239F2; Mon, 17 Aug 2020 16:29:00 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07HGT082089088; Mon, 17 Aug 2020 16:29:00 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07HGT0HR089083; Mon, 17 Aug 2020 16:29:00 GMT (envelope-from bz@FreeBSD.org) Message-Id: <202008171629.07HGT0HR089083@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Mon, 17 Aug 2020 16:29:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r364312 - head/sys/net80211 X-SVN-Group: head X-SVN-Commit-Author: bz X-SVN-Commit-Paths: head/sys/net80211 X-SVN-Commit-Revision: 364312 X-SVN-Commit-Repository: base 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.33 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, 17 Aug 2020 16:29:01 -0000 Author: bz Date: Mon Aug 17 16:28:59 2020 New Revision: 364312 URL: https://svnweb.freebsd.org/changeset/base/364312 Log: net80211: remove vertical whitespace No functional changes. MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC (d/b/a "Netgate") Modified: head/sys/net80211/ieee80211.c head/sys/net80211/ieee80211_ioctl.c head/sys/net80211/ieee80211_vht.c Modified: head/sys/net80211/ieee80211.c ============================================================================== --- head/sys/net80211/ieee80211.c Mon Aug 17 16:27:02 2020 (r364311) +++ head/sys/net80211/ieee80211.c Mon Aug 17 16:28:59 2020 (r364312) @@ -529,8 +529,7 @@ ieee80211_vap_setup(struct ieee80211com *ic, struct ie ifp = if_alloc(IFT_ETHER); if (ifp == NULL) { - ic_printf(ic, "%s: unable to allocate ifnet\n", - __func__); + ic_printf(ic, "%s: unable to allocate ifnet\n", __func__); return ENOMEM; } if_initname(ifp, name, unit); @@ -1210,9 +1209,7 @@ set_vht_extchan(struct ieee80211_channel *c) } printf("%s: unknown VHT channel type (ieee=%d, flags=0x%08x)\n", - __func__, - c->ic_ieee, - c->ic_flags); + __func__, c->ic_ieee, c->ic_flags); return (0); } @@ -1247,11 +1244,7 @@ addchan(struct ieee80211_channel chans[], int maxchans #if 0 printf("%s: %d: ieee=%d, freq=%d, flags=0x%08x\n", - __func__, - *nchans, - ieee, - freq, - flags); + __func__, *nchans, ieee, freq, flags); #endif c = &chans[(*nchans)++]; @@ -1281,9 +1274,7 @@ copychan_prev(struct ieee80211_channel chans[], int ma #if 0 printf("%s: %d: flags=0x%08x\n", - __func__, - *nchans, - flags); + __func__, *nchans, flags); #endif c = &chans[(*nchans)++]; @@ -1779,11 +1770,7 @@ ieee80211_lookup_channel_rxstatus(struct ieee80211vap IEEE80211_DPRINTF(vap, IEEE80211_MSG_INPUT, "%s: freq=%d, ieee=%d, flags=0x%08x; c=%p\n", - __func__, - (int) rxs->c_freq, - (int) rxs->c_ieee, - flags, - c); + __func__, (int) rxs->c_freq, (int) rxs->c_ieee, flags, c); return (c); } Modified: head/sys/net80211/ieee80211_ioctl.c ============================================================================== --- head/sys/net80211/ieee80211_ioctl.c Mon Aug 17 16:27:02 2020 (r364311) +++ head/sys/net80211/ieee80211_ioctl.c Mon Aug 17 16:28:59 2020 (r364312) @@ -1159,12 +1159,9 @@ ieee80211_ioctl_get80211(struct ieee80211vap *vap, u_l if (vap->iv_flags_ext & IEEE80211_FEXT_UAPSD) ireq->i_val = 1; break; - - /* VHT */ case IEEE80211_IOC_VHTCONF: ireq->i_val = vap->iv_flags_vht & IEEE80211_FVHT_MASK; break; - default: error = ieee80211_ioctl_getdefault(vap, ireq); break; Modified: head/sys/net80211/ieee80211_vht.c ============================================================================== --- head/sys/net80211/ieee80211_vht.c Mon Aug 17 16:27:02 2020 (r364311) +++ head/sys/net80211/ieee80211_vht.c Mon Aug 17 16:28:59 2020 (r364312) @@ -93,9 +93,7 @@ vht_recv_action_placeholder(struct ieee80211_node *ni, #ifdef IEEE80211_DEBUG ieee80211_note(ni->ni_vap, "%s: called; fc=0x%.2x/0x%.2x", - __func__, - wh->i_fc[0], - wh->i_fc[1]); + __func__, wh->i_fc[0], wh->i_fc[1]); #endif return (0); } @@ -107,9 +105,7 @@ vht_send_action_placeholder(struct ieee80211_node *ni, #ifdef IEEE80211_DEBUG ieee80211_note(ni->ni_vap, "%s: called; category=%d, action=%d", - __func__, - category, - action); + __func__, category, action); #endif return (EINVAL); } @@ -229,9 +225,7 @@ ieee80211_vht_announce(struct ieee80211com *ic) if (tx == 3 && rx == 3) continue; ic_printf(ic, "[VHT] NSS %d: TX MCS 0..%d, RX MCS 0..%d\n", - i + 1, - vht_mcs_to_num(tx), - vht_mcs_to_num(rx)); + i + 1, vht_mcs_to_num(tx), vht_mcs_to_num(rx)); } } @@ -269,10 +263,7 @@ ieee80211_parse_vhtopmode(struct ieee80211_node *ni, c #if 0 printf("%s: chan1=%d, chan2=%d, chanwidth=%d, basicmcs=0x%04x\n", - __func__, - ni->ni_vht_chan1, - ni->ni_vht_chan2, - ni->ni_vht_chanwidth, + __func__, ni->ni_vht_chan1, ni->ni_vht_chan2, ni->ni_vht_chanwidth, ni->ni_vht_basicmcs); #endif } @@ -702,27 +693,20 @@ ieee80211_vht_get_chwidth_ie(struct ieee80211_channel * well? */ - if (IEEE80211_IS_CHAN_VHT160(c)) { + if (IEEE80211_IS_CHAN_VHT160(c)) return IEEE80211_VHT_CHANWIDTH_160MHZ; - } - if (IEEE80211_IS_CHAN_VHT80P80(c)) { + if (IEEE80211_IS_CHAN_VHT80P80(c)) return IEEE80211_VHT_CHANWIDTH_80P80MHZ; - } - if (IEEE80211_IS_CHAN_VHT80(c)) { + if (IEEE80211_IS_CHAN_VHT80(c)) return IEEE80211_VHT_CHANWIDTH_80MHZ; - } - if (IEEE80211_IS_CHAN_VHT40(c)) { + if (IEEE80211_IS_CHAN_VHT40(c)) return IEEE80211_VHT_CHANWIDTH_USE_HT; - } - if (IEEE80211_IS_CHAN_VHT20(c)) { + if (IEEE80211_IS_CHAN_VHT20(c)) return IEEE80211_VHT_CHANWIDTH_USE_HT; - } /* We shouldn't get here */ printf("%s: called on a non-VHT channel (freq=%d, flags=0x%08x\n", - __func__, - (int) c->ic_freq, - c->ic_flags); + __func__, (int) c->ic_freq, c->ic_flags); return IEEE80211_VHT_CHANWIDTH_USE_HT; }