Merge branch 'master' of... (f6f22303) · Commits · 戴 / test

Documentation/DocBook/mac80211.tmpl

+0 −1

Original line number	Diff line number	Diff line
		@@ -234,7 +234,6 @@ usage should require reading the full document.
		<title>Multiple queues and QoS support</title>
		<para>TBD</para>
		!Finclude/net/mac80211.h ieee80211_tx_queue_params
		!Finclude/net/mac80211.h ieee80211_tx_queue_stats
		</chapter>

		<chapter id="AP">

+0 −13

Original line number	Diff line number	Diff line
		@@ -302,18 +302,6 @@ static int adm8211_get_stats(struct ieee80211_hw *dev,
		return 0;
		}

		static int adm8211_get_tx_stats(struct ieee80211_hw *dev,
		struct ieee80211_tx_queue_stats *stats)
		{
		struct adm8211_priv *priv = dev->priv;

		stats[0].len = priv->cur_tx - priv->dirty_tx;
		stats[0].limit = priv->tx_ring_size - 2;
		stats[0].count = priv->dirty_tx;

		return 0;
		}

		static void adm8211_interrupt_tci(struct ieee80211_hw *dev)
		{
		struct adm8211_priv *priv = dev->priv;
		@@ -1773,7 +1761,6 @@ static const struct ieee80211_ops adm8211_ops = {
		.prepare_multicast = adm8211_prepare_multicast,
		.configure_filter = adm8211_configure_filter,
		.get_stats = adm8211_get_stats,
		.get_tx_stats = adm8211_get_tx_stats,
		.get_tsf = adm8211_get_tsft
		};

+7 −1

Original line number	Diff line number	Diff line
		@@ -144,6 +144,12 @@ struct ar9170_sta_tid {
		bool active;
		};

		struct ar9170_tx_queue_stats {
		unsigned int len;
		unsigned int limit;
		unsigned int count;
		};

		#define AR9170_QUEUE_TIMEOUT 64
		#define AR9170_TX_TIMEOUT 8
		#define AR9170_BA_TIMEOUT 4
		@@ -211,7 +217,7 @@ struct ar9170 {

		/* qos queue settings */
		spinlock_t tx_stats_lock;
		struct ieee80211_tx_queue_stats tx_stats[5];
		struct ar9170_tx_queue_stats tx_stats[5];
		struct ieee80211_tx_queue_params edcf[5];

		spinlock_t cmdlock;

+0 −13

Original line number	Diff line number	Diff line
		@@ -2396,18 +2396,6 @@ static int ar9170_get_stats(struct ieee80211_hw *hw,
		return 0;
		}

		static int ar9170_get_tx_stats(struct ieee80211_hw *hw,
		struct ieee80211_tx_queue_stats *tx_stats)
		{
		struct ar9170 *ar = hw->priv;

		spin_lock_bh(&ar->tx_stats_lock);
		memcpy(tx_stats, ar->tx_stats, sizeof(tx_stats[0]) * hw->queues);
		spin_unlock_bh(&ar->tx_stats_lock);

		return 0;
		}

		static int ar9170_conf_tx(struct ieee80211_hw *hw, u16 queue,
		const struct ieee80211_tx_queue_params *param)
		{
		@@ -2509,7 +2497,6 @@ static const struct ieee80211_ops ar9170_ops = {
		.set_key = ar9170_set_key,
		.sta_notify = ar9170_sta_notify,
		.get_stats = ar9170_get_stats,
		.get_tx_stats = ar9170_get_tx_stats,
		.ampdu_action = ar9170_ampdu_action,
		};

+0 −1

Original line number	Diff line number	Diff line
		@@ -541,7 +541,6 @@ struct ath5k_txq_info {
		/*
		* Transmit packet types.
		* used on tx control descriptor
		* TODO: Use them inside base.c corectly
		*/
		enum ath5k_pkt_type {
		AR5K_PKT_TYPE_NORMAL = 0,