ieee80211_wake_txq() and ieee80211_wake_txqs() are not used. Rename: _ieee80211_wake_txqs() -> ieee80211_wake_txqs() __ieee80211_wake_txqs() -> _ieee80211_wake_txqs() __ieee80211_wake_txq() -> ieee80211_wake_txq() Signed-off-by: Alexander Wetzel <Alexander@xxxxxxxxxxxxxx> --- net/mac80211/iface.c | 2 +- net/mac80211/util.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 5cebe38af44f..a78dcbc4c1ab 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -467,7 +467,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, bool going_do lockdep_assert_wiphy(local->hw.wiphy); clear_bit(SDATA_STATE_RUNNING, &sdata->state); - synchronize_rcu(); /* flush _ieee80211_wake_txqs() */ + synchronize_rcu(); /* flush ieee80211_wake_txqs() */ cancel_scan = rcu_access_pointer(local->scan_sdata) == sdata; if (cancel_scan) diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 98a05b4d9dcd..cce7c3794a90 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -320,8 +320,8 @@ EXPORT_SYMBOL(ieee80211_handle_wake_tx_queue); __releases(&local->fq->lock) __acquires(&local->fq->lock) -static void __ieee80211_wake_txq(struct ieee80211_local *local, - struct ieee80211_txq *txq) +static void ieee80211_wake_txq(struct ieee80211_local *local, + struct ieee80211_txq *txq) { struct txq_info *txqi = to_txq_info(txq); struct fq *fq = &local->fq; @@ -334,7 +334,7 @@ static void __ieee80211_wake_txq(struct ieee80211_local *local, } } -static void __ieee80211_wake_txqs(struct ieee80211_sub_if_data *sdata, int ac) +static void _ieee80211_wake_txqs(struct ieee80211_sub_if_data *sdata, int ac) { struct ieee80211_local *local = sdata->local; struct fq *fq = &local->fq; @@ -365,11 +365,11 @@ static void __ieee80211_wake_txqs(struct ieee80211_sub_if_data *sdata, int ac) */ if (ac == txq_fb->ac) - __ieee80211_wake_txq(local, txq_fb); + ieee80211_wake_txq(local, txq_fb); if (txq_mc && ac == txq_mc->ac && (!ps || !atomic_read(&ps->num_sta_ps))) - __ieee80211_wake_txq(local, txq_mc); + ieee80211_wake_txq(local, txq_mc); /* STA TXQs */ list_for_each_entry_rcu(sta, &local->sta_list, list) { @@ -390,7 +390,7 @@ static void __ieee80211_wake_txqs(struct ieee80211_sub_if_data *sdata, int ac) continue; /* releases and retakes fq->lock */ - __ieee80211_wake_txq(local, txq); + ieee80211_wake_txq(local, txq); } } out: @@ -401,7 +401,7 @@ static void __ieee80211_wake_txqs(struct ieee80211_sub_if_data *sdata, int ac) static void __releases(&local->queue_stop_reason_lock) __acquires(&local->queue_stop_reason_lock) -_ieee80211_wake_txqs(struct ieee80211_local *local, unsigned long *flags) +ieee80211_wake_txqs(struct ieee80211_local *local, unsigned long *flags) { struct ieee80211_sub_if_data *sdata; int n_acs = IEEE80211_NUM_ACS; @@ -428,7 +428,7 @@ _ieee80211_wake_txqs(struct ieee80211_local *local, unsigned long *flags) if (ac_queue == i || sdata->vif.cab_queue == i) - __ieee80211_wake_txqs(sdata, ac); + _ieee80211_wake_txqs(sdata, ac); } } spin_lock_irqsave(&local->queue_stop_reason_lock, *flags); @@ -472,13 +472,13 @@ static void __ieee80211_wake_queue(struct ieee80211_hw *hw, int queue, tasklet_schedule(&local->tx_pending_tasklet); /* - * Calling _ieee80211_wake_txqs here can be a problem because it may + * Calling ieee80211_wake_txqs here can be a problem because it may * release queue_stop_reason_lock which has been taken by * __ieee80211_wake_queue's caller. It is certainly not very nice to * release someone's lock, but it is fine because all the callers of * __ieee80211_wake_queue call it right before releasing the lock. */ - _ieee80211_wake_txqs(local, flags); + ieee80211_wake_txqs(local, flags); } static int ac_has_active_txq(struct ieee80211_local *local) -- 2.48.1