net80211: remove vertical whitespace
No functional changes. MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC (d/b/a "Netgate")
This commit is contained in:
parent
1921bb7b68
commit
372c7b9504
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=364312
@ -529,8 +529,7 @@ ieee80211_vap_setup(struct ieee80211com *ic, struct ieee80211vap *vap,
|
|||||||
|
|
||||||
ifp = if_alloc(IFT_ETHER);
|
ifp = if_alloc(IFT_ETHER);
|
||||||
if (ifp == NULL) {
|
if (ifp == NULL) {
|
||||||
ic_printf(ic, "%s: unable to allocate ifnet\n",
|
ic_printf(ic, "%s: unable to allocate ifnet\n", __func__);
|
||||||
__func__);
|
|
||||||
return ENOMEM;
|
return ENOMEM;
|
||||||
}
|
}
|
||||||
if_initname(ifp, name, unit);
|
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",
|
printf("%s: unknown VHT channel type (ieee=%d, flags=0x%08x)\n",
|
||||||
__func__,
|
__func__, c->ic_ieee, c->ic_flags);
|
||||||
c->ic_ieee,
|
|
||||||
c->ic_flags);
|
|
||||||
|
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
@ -1247,11 +1244,7 @@ addchan(struct ieee80211_channel chans[], int maxchans, int *nchans,
|
|||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
printf("%s: %d: ieee=%d, freq=%d, flags=0x%08x\n",
|
printf("%s: %d: ieee=%d, freq=%d, flags=0x%08x\n",
|
||||||
__func__,
|
__func__, *nchans, ieee, freq, flags);
|
||||||
*nchans,
|
|
||||||
ieee,
|
|
||||||
freq,
|
|
||||||
flags);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
c = &chans[(*nchans)++];
|
c = &chans[(*nchans)++];
|
||||||
@ -1281,9 +1274,7 @@ copychan_prev(struct ieee80211_channel chans[], int maxchans, int *nchans,
|
|||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
printf("%s: %d: flags=0x%08x\n",
|
printf("%s: %d: flags=0x%08x\n",
|
||||||
__func__,
|
__func__, *nchans, flags);
|
||||||
*nchans,
|
|
||||||
flags);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
c = &chans[(*nchans)++];
|
c = &chans[(*nchans)++];
|
||||||
@ -1779,11 +1770,7 @@ ieee80211_lookup_channel_rxstatus(struct ieee80211vap *vap,
|
|||||||
|
|
||||||
IEEE80211_DPRINTF(vap, IEEE80211_MSG_INPUT,
|
IEEE80211_DPRINTF(vap, IEEE80211_MSG_INPUT,
|
||||||
"%s: freq=%d, ieee=%d, flags=0x%08x; c=%p\n",
|
"%s: freq=%d, ieee=%d, flags=0x%08x; c=%p\n",
|
||||||
__func__,
|
__func__, (int) rxs->c_freq, (int) rxs->c_ieee, flags, c);
|
||||||
(int) rxs->c_freq,
|
|
||||||
(int) rxs->c_ieee,
|
|
||||||
flags,
|
|
||||||
c);
|
|
||||||
|
|
||||||
return (c);
|
return (c);
|
||||||
}
|
}
|
||||||
|
@ -1159,12 +1159,9 @@ ieee80211_ioctl_get80211(struct ieee80211vap *vap, u_long cmd,
|
|||||||
if (vap->iv_flags_ext & IEEE80211_FEXT_UAPSD)
|
if (vap->iv_flags_ext & IEEE80211_FEXT_UAPSD)
|
||||||
ireq->i_val = 1;
|
ireq->i_val = 1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* VHT */
|
|
||||||
case IEEE80211_IOC_VHTCONF:
|
case IEEE80211_IOC_VHTCONF:
|
||||||
ireq->i_val = vap->iv_flags_vht & IEEE80211_FVHT_MASK;
|
ireq->i_val = vap->iv_flags_vht & IEEE80211_FVHT_MASK;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
error = ieee80211_ioctl_getdefault(vap, ireq);
|
error = ieee80211_ioctl_getdefault(vap, ireq);
|
||||||
break;
|
break;
|
||||||
|
@ -93,9 +93,7 @@ vht_recv_action_placeholder(struct ieee80211_node *ni,
|
|||||||
|
|
||||||
#ifdef IEEE80211_DEBUG
|
#ifdef IEEE80211_DEBUG
|
||||||
ieee80211_note(ni->ni_vap, "%s: called; fc=0x%.2x/0x%.2x",
|
ieee80211_note(ni->ni_vap, "%s: called; fc=0x%.2x/0x%.2x",
|
||||||
__func__,
|
__func__, wh->i_fc[0], wh->i_fc[1]);
|
||||||
wh->i_fc[0],
|
|
||||||
wh->i_fc[1]);
|
|
||||||
#endif
|
#endif
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
@ -107,9 +105,7 @@ vht_send_action_placeholder(struct ieee80211_node *ni,
|
|||||||
|
|
||||||
#ifdef IEEE80211_DEBUG
|
#ifdef IEEE80211_DEBUG
|
||||||
ieee80211_note(ni->ni_vap, "%s: called; category=%d, action=%d",
|
ieee80211_note(ni->ni_vap, "%s: called; category=%d, action=%d",
|
||||||
__func__,
|
__func__, category, action);
|
||||||
category,
|
|
||||||
action);
|
|
||||||
#endif
|
#endif
|
||||||
return (EINVAL);
|
return (EINVAL);
|
||||||
}
|
}
|
||||||
@ -229,9 +225,7 @@ ieee80211_vht_announce(struct ieee80211com *ic)
|
|||||||
if (tx == 3 && rx == 3)
|
if (tx == 3 && rx == 3)
|
||||||
continue;
|
continue;
|
||||||
ic_printf(ic, "[VHT] NSS %d: TX MCS 0..%d, RX MCS 0..%d\n",
|
ic_printf(ic, "[VHT] NSS %d: TX MCS 0..%d, RX MCS 0..%d\n",
|
||||||
i + 1,
|
i + 1, vht_mcs_to_num(tx), vht_mcs_to_num(rx));
|
||||||
vht_mcs_to_num(tx),
|
|
||||||
vht_mcs_to_num(rx));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -269,10 +263,7 @@ ieee80211_parse_vhtopmode(struct ieee80211_node *ni, const uint8_t *ie)
|
|||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
printf("%s: chan1=%d, chan2=%d, chanwidth=%d, basicmcs=0x%04x\n",
|
printf("%s: chan1=%d, chan2=%d, chanwidth=%d, basicmcs=0x%04x\n",
|
||||||
__func__,
|
__func__, ni->ni_vht_chan1, ni->ni_vht_chan2, ni->ni_vht_chanwidth,
|
||||||
ni->ni_vht_chan1,
|
|
||||||
ni->ni_vht_chan2,
|
|
||||||
ni->ni_vht_chanwidth,
|
|
||||||
ni->ni_vht_basicmcs);
|
ni->ni_vht_basicmcs);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@ -702,27 +693,20 @@ ieee80211_vht_get_chwidth_ie(struct ieee80211_channel *c)
|
|||||||
* well?
|
* well?
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (IEEE80211_IS_CHAN_VHT160(c)) {
|
if (IEEE80211_IS_CHAN_VHT160(c))
|
||||||
return IEEE80211_VHT_CHANWIDTH_160MHZ;
|
return IEEE80211_VHT_CHANWIDTH_160MHZ;
|
||||||
}
|
if (IEEE80211_IS_CHAN_VHT80P80(c))
|
||||||
if (IEEE80211_IS_CHAN_VHT80P80(c)) {
|
|
||||||
return IEEE80211_VHT_CHANWIDTH_80P80MHZ;
|
return IEEE80211_VHT_CHANWIDTH_80P80MHZ;
|
||||||
}
|
if (IEEE80211_IS_CHAN_VHT80(c))
|
||||||
if (IEEE80211_IS_CHAN_VHT80(c)) {
|
|
||||||
return IEEE80211_VHT_CHANWIDTH_80MHZ;
|
return IEEE80211_VHT_CHANWIDTH_80MHZ;
|
||||||
}
|
if (IEEE80211_IS_CHAN_VHT40(c))
|
||||||
if (IEEE80211_IS_CHAN_VHT40(c)) {
|
|
||||||
return IEEE80211_VHT_CHANWIDTH_USE_HT;
|
return IEEE80211_VHT_CHANWIDTH_USE_HT;
|
||||||
}
|
if (IEEE80211_IS_CHAN_VHT20(c))
|
||||||
if (IEEE80211_IS_CHAN_VHT20(c)) {
|
|
||||||
return IEEE80211_VHT_CHANWIDTH_USE_HT;
|
return IEEE80211_VHT_CHANWIDTH_USE_HT;
|
||||||
}
|
|
||||||
|
|
||||||
/* We shouldn't get here */
|
/* We shouldn't get here */
|
||||||
printf("%s: called on a non-VHT channel (freq=%d, flags=0x%08x\n",
|
printf("%s: called on a non-VHT channel (freq=%d, flags=0x%08x\n",
|
||||||
__func__,
|
__func__, (int) c->ic_freq, c->ic_flags);
|
||||||
(int) c->ic_freq,
|
|
||||||
c->ic_flags);
|
|
||||||
return IEEE80211_VHT_CHANWIDTH_USE_HT;
|
return IEEE80211_VHT_CHANWIDTH_USE_HT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user