Commit 107395f9 authored by Alexander Wetzel's avatar Alexander Wetzel Committed by Johannes Berg
Browse files

wifi: mac80211: Drop support for TX push path 



All drivers are now using mac80211 internal queues (iTXQs).
Drop mac80211 internal support for the old push path.

Signed-off-by: default avatarAlexander Wetzel <alexander@wetzel-home.de>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent dfd2d876

net/mac80211/cfg.c

+0 −3
Original line number Diff line number Diff line
@@ -4340,9 +4340,6 @@ static int ieee80211_get_txq_stats(struct wiphy *wiphy, 
	struct ieee80211_sub_if_data *sdata;

	int ret = 0;



	if (!local->ops->wake_tx_queue)

		return 1;



	spin_lock_bh(&local->fq.lock);

	rcu_read_lock();

net/mac80211/debugfs.c

+1 −3
Original line number Diff line number Diff line
@@ -663,8 +663,6 @@ void debugfs_hw_add(struct ieee80211_local *local) 
	DEBUGFS_ADD_MODE(force_tx_status, 0600);

	DEBUGFS_ADD_MODE(aql_enable, 0600);

	DEBUGFS_ADD(aql_pending);



	if (local->ops->wake_tx_queue)

	DEBUGFS_ADD_MODE(aqm, 0600);



	DEBUGFS_ADD_MODE(airtime_flags, 0600);

net/mac80211/debugfs_netdev.c

+1 −2
Original line number Diff line number Diff line
@@ -677,8 +677,7 @@ static void add_common_files(struct ieee80211_sub_if_data *sdata) 
	DEBUGFS_ADD(rc_rateidx_vht_mcs_mask_5ghz);

	DEBUGFS_ADD(hw_queues);



	if (sdata->local->ops->wake_tx_queue &&

	    sdata->vif.type != NL80211_IFTYPE_P2P_DEVICE &&

	if (sdata->vif.type != NL80211_IFTYPE_P2P_DEVICE &&

	    sdata->vif.type != NL80211_IFTYPE_NAN)

		DEBUGFS_ADD(aqm);

}

net/mac80211/debugfs_sta.c

+2 −4
Original line number Diff line number Diff line
@@ -1072,10 +1072,8 @@ void ieee80211_sta_debugfs_add(struct sta_info *sta) 
	/* FIXME: Kept here as the statistics are only done on the deflink */

	DEBUGFS_ADD_COUNTER(tx_filtered, deflink.status_stats.filtered);



	if (local->ops->wake_tx_queue) {

	DEBUGFS_ADD(aqm);

	DEBUGFS_ADD(airtime);

	}



	if (wiphy_ext_feature_isset(local->hw.wiphy,

				    NL80211_EXT_FEATURE_AQL))

net/mac80211/ieee80211_i.h

+0 −1
Original line number Diff line number Diff line
@@ -2307,7 +2307,6 @@ void ieee80211_wake_queue_by_reason(struct ieee80211_hw *hw, int queue, 
void ieee80211_stop_queue_by_reason(struct ieee80211_hw *hw, int queue,

				    enum queue_stop_reason reason,

				    bool refcounted);

void ieee80211_propagate_queue_wake(struct ieee80211_local *local, int queue);

void ieee80211_add_pending_skb(struct ieee80211_local *local,

			       struct sk_buff *skb);

void ieee80211_add_pending_skbs(struct ieee80211_local *local,