LinuxKPI: 802.11: use ic_printf more consistently
Rather than printing ic_name ourselves (or not at all) use ic_printf() as a common function from net80211 where possible. Sponsored by: The FreeBSD Foundation MFC after: 3 days
This commit is contained in:
parent
c322cf0f48
commit
3f0083c4e3
@ -2172,7 +2172,7 @@ lkpi_wme_update(struct lkpi_hw *lhw, struct ieee80211vap *vap, bool planned)
|
|||||||
txqp.aifs = wmep->wmep_aifsn;
|
txqp.aifs = wmep->wmep_aifsn;
|
||||||
error = lkpi_80211_mo_conf_tx(hw, vif, ac, &txqp);
|
error = lkpi_80211_mo_conf_tx(hw, vif, ac, &txqp);
|
||||||
if (error != 0)
|
if (error != 0)
|
||||||
printf("%s: conf_tx ac %u failed %d\n",
|
ic_printf(ic, "%s: conf_tx ac %u failed %d\n",
|
||||||
__func__, ac, error);
|
__func__, ac, error);
|
||||||
}
|
}
|
||||||
LKPI_80211_LHW_UNLOCK(lhw);
|
LKPI_80211_LHW_UNLOCK(lhw);
|
||||||
@ -2291,7 +2291,7 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ],
|
|||||||
|
|
||||||
error = lkpi_80211_mo_start(hw);
|
error = lkpi_80211_mo_start(hw);
|
||||||
if (error != 0) {
|
if (error != 0) {
|
||||||
printf("%s: failed to start hw: %d\n", __func__, error);
|
ic_printf(ic, "%s: failed to start hw: %d\n", __func__, error);
|
||||||
mtx_destroy(&lvif->mtx);
|
mtx_destroy(&lvif->mtx);
|
||||||
free(lvif, M_80211_VAP);
|
free(lvif, M_80211_VAP);
|
||||||
return (NULL);
|
return (NULL);
|
||||||
@ -2300,7 +2300,7 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ],
|
|||||||
error = lkpi_80211_mo_add_interface(hw, vif);
|
error = lkpi_80211_mo_add_interface(hw, vif);
|
||||||
if (error != 0) {
|
if (error != 0) {
|
||||||
IMPROVE(); /* XXX-BZ mo_stop()? */
|
IMPROVE(); /* XXX-BZ mo_stop()? */
|
||||||
printf("%s: failed to add interface: %d\n", __func__, error);
|
ic_printf(ic, "%s: failed to add interface: %d\n", __func__, error);
|
||||||
mtx_destroy(&lvif->mtx);
|
mtx_destroy(&lvif->mtx);
|
||||||
free(lvif, M_80211_VAP);
|
free(lvif, M_80211_VAP);
|
||||||
return (NULL);
|
return (NULL);
|
||||||
@ -3100,7 +3100,7 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m)
|
|||||||
*/
|
*/
|
||||||
skb = dev_alloc_skb(hw->extra_tx_headroom + m->m_pkthdr.len);
|
skb = dev_alloc_skb(hw->extra_tx_headroom + m->m_pkthdr.len);
|
||||||
if (skb == NULL) {
|
if (skb == NULL) {
|
||||||
printf("XXX ERROR %s: skb alloc failed\n", __func__);
|
ic_printf(ic, "ERROR %s: skb alloc failed\n", __func__);
|
||||||
ieee80211_free_node(ni);
|
ieee80211_free_node(ni);
|
||||||
m_freem(m);
|
m_freem(m);
|
||||||
return;
|
return;
|
||||||
@ -3288,8 +3288,8 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan,
|
|||||||
int cflags = chan_flags;
|
int cflags = chan_flags;
|
||||||
|
|
||||||
if (channels[i].flags & IEEE80211_CHAN_DISABLED) {
|
if (channels[i].flags & IEEE80211_CHAN_DISABLED) {
|
||||||
printf("%s: %s: Skipping disabled chan "
|
ic_printf(ic, "%s: Skipping disabled chan "
|
||||||
"[%u/%u/%#x]\n", ic->ic_name, __func__,
|
"[%u/%u/%#x]\n", __func__,
|
||||||
channels[i].hw_value,
|
channels[i].hw_value,
|
||||||
channels[i].center_freq, channels[i].flags);
|
channels[i].center_freq, channels[i].flags);
|
||||||
continue;
|
continue;
|
||||||
@ -3312,8 +3312,8 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan,
|
|||||||
nflags, bands, chan_flags);
|
nflags, bands, chan_flags);
|
||||||
/* net80211::ENOBUFS: *n >= maxchans */
|
/* net80211::ENOBUFS: *n >= maxchans */
|
||||||
if (error != 0 && error != ENOBUFS)
|
if (error != 0 && error != ENOBUFS)
|
||||||
printf("%s: %s: Adding chan %u/%u/%#x/%#x/%#x/%#x "
|
ic_printf(ic, "%s: Adding chan %u/%u/%#x/%#x/%#x/%#x "
|
||||||
"returned error %d\n", ic->ic_name,
|
"returned error %d\n",
|
||||||
__func__, channels[i].hw_value,
|
__func__, channels[i].hw_value,
|
||||||
channels[i].center_freq, channels[i].flags,
|
channels[i].center_freq, channels[i].flags,
|
||||||
nflags, chan_flags, cflags, error);
|
nflags, chan_flags, cflags, error);
|
||||||
@ -3358,8 +3358,8 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan,
|
|||||||
int cflags = chan_flags;
|
int cflags = chan_flags;
|
||||||
|
|
||||||
if (channels[i].flags & IEEE80211_CHAN_DISABLED) {
|
if (channels[i].flags & IEEE80211_CHAN_DISABLED) {
|
||||||
printf("%s: %s: Skipping disabled chan "
|
ic_printf(ic, "%s: Skipping disabled chan "
|
||||||
"[%u/%u/%#x]\n", ic->ic_name, __func__,
|
"[%u/%u/%#x]\n", __func__,
|
||||||
channels[i].hw_value,
|
channels[i].hw_value,
|
||||||
channels[i].center_freq, channels[i].flags);
|
channels[i].center_freq, channels[i].flags);
|
||||||
continue;
|
continue;
|
||||||
@ -3382,8 +3382,8 @@ lkpi_ic_getradiocaps(struct ieee80211com *ic, int maxchan,
|
|||||||
nflags, bands, chan_flags);
|
nflags, bands, chan_flags);
|
||||||
/* net80211::ENOBUFS: *n >= maxchans */
|
/* net80211::ENOBUFS: *n >= maxchans */
|
||||||
if (error != 0 && error != ENOBUFS)
|
if (error != 0 && error != ENOBUFS)
|
||||||
printf("%s: %s: Adding chan %u/%u/%#x/%#x/%#x/%#x "
|
ic_printf(ic, "%s: Adding chan %u/%u/%#x/%#x/%#x/%#x "
|
||||||
"returned error %d\n", ic->ic_name,
|
"returned error %d\n",
|
||||||
__func__, channels[i].hw_value,
|
__func__, channels[i].hw_value,
|
||||||
channels[i].center_freq, channels[i].flags,
|
channels[i].center_freq, channels[i].flags,
|
||||||
nflags, chan_flags, cflags, error);
|
nflags, chan_flags, cflags, error);
|
||||||
|
Loading…
Reference in New Issue
Block a user