@@ -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)
@@ -318,8 +318,8 @@ void ieee80211_handle_wake_tx_queue(struct ieee80211_hw *hw,
}
EXPORT_SYMBOL(ieee80211_handle_wake_tx_queue);
-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;
@@ -331,7 +331,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;
@@ -354,15 +354,13 @@ static void __ieee80211_wake_txqs(struct ieee80211_sub_if_data *sdata, int ac)
/* %IEEE80211_VIF_TXQ_NOQUEUE must be ignored here */
- if (ac == IEEE80211_AC_VO) {
- __ieee80211_wake_txq(local,
- vif->txq[IEEE80211_VIF_TXQ_FALLBACK]);
- }
+ if (ac == IEEE80211_AC_VO)
+ ieee80211_wake_txq(local, vif->txq[IEEE80211_VIF_TXQ_FALLBACK]);
if (ac == IEEE80211_AC_BE && vif->txq[IEEE80211_VIF_TXQ_MULTICAST] &&
(!ps || !atomic_read(&ps->num_sta_ps)))
- __ieee80211_wake_txq(local,
- vif->txq[IEEE80211_VIF_TXQ_MULTICAST]);
+ ieee80211_wake_txq(local,
+ vif->txq[IEEE80211_VIF_TXQ_MULTICAST]);
list_for_each_entry_rcu(sta, &local->sta_list, list) {
if (sdata != sta->sdata)
@@ -378,7 +376,7 @@ static void __ieee80211_wake_txqs(struct ieee80211_sub_if_data *sdata, int ac)
if (ac != txq->ac)
continue;
- __ieee80211_wake_txq(local, txq);
+ ieee80211_wake_txq(local, txq);
}
}
out:
@@ -389,7 +387,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;
@@ -416,7 +414,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);
@@ -459,13 +457,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)
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@wetzel-home.de> --- net/mac80211/iface.c | 2 +- net/mac80211/util.c | 26 ++++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-)