Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1296d474 authored by Kalle Valo's avatar Kalle Valo Committed by John W. Linville
Browse files

iwlwifi: remove get_tx_stats() mac80211 op 



get_tx_stats() will be removed from mac80211.

Compile-tested only.

Cc: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarKalle Valo <kalle.valo@iki.fi>
Acked-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8b2bbe66

drivers/net/wireless/iwlwifi/iwl-agn.c

+0 −1
Original line number Diff line number Diff line
@@ -3440,7 +3440,6 @@ static struct ieee80211_ops iwl_hw_ops = { 
	.set_key = iwl_mac_set_key,

	.update_tkip_key = iwl_mac_update_tkip_key,

	.get_stats = iwl_mac_get_stats,

	.get_tx_stats = iwl_mac_get_tx_stats,

	.conf_tx = iwl_mac_conf_tx,

	.reset_tsf = iwl_mac_reset_tsf,

	.bss_info_changed = iwl_bss_info_changed,

drivers/net/wireless/iwlwifi/iwl-core.c

+0 −36
Original line number Diff line number Diff line
@@ -2851,42 +2851,6 @@ out: 
}

EXPORT_SYMBOL(iwl_mac_config);



int iwl_mac_get_tx_stats(struct ieee80211_hw *hw,

			 struct ieee80211_tx_queue_stats *stats)

{

	struct iwl_priv *priv = hw->priv;

	int i, avail;

	struct iwl_tx_queue *txq;

	struct iwl_queue *q;

	unsigned long flags;



	IWL_DEBUG_MAC80211(priv, "enter\n");



	if (!iwl_is_ready_rf(priv)) {

		IWL_DEBUG_MAC80211(priv, "leave - RF not ready\n");

		return -EIO;

	}



	spin_lock_irqsave(&priv->lock, flags);



	for (i = 0; i < AC_NUM; i++) {

		txq = &priv->txq[i];

		q = &txq->q;

		avail = iwl_queue_space(q);



		stats[i].len = q->n_window - avail;

		stats[i].limit = q->n_window - q->high_mark;

		stats[i].count = q->n_window;



	}

	spin_unlock_irqrestore(&priv->lock, flags);



	IWL_DEBUG_MAC80211(priv, "leave\n");



	return 0;

}

EXPORT_SYMBOL(iwl_mac_get_tx_stats);



void iwl_mac_reset_tsf(struct ieee80211_hw *hw)

{

	struct iwl_priv *priv = hw->priv;

drivers/net/wireless/iwlwifi/iwl-core.h

+0 −2
Original line number Diff line number Diff line
@@ -342,8 +342,6 @@ void iwl_mac_remove_interface(struct ieee80211_hw *hw, 
			      struct ieee80211_vif *vif);

int iwl_mac_config(struct ieee80211_hw *hw, u32 changed);

void iwl_config_ap(struct iwl_priv *priv);

int iwl_mac_get_tx_stats(struct ieee80211_hw *hw,

			 struct ieee80211_tx_queue_stats *stats);

void iwl_mac_reset_tsf(struct ieee80211_hw *hw);

int iwl_alloc_txq_mem(struct iwl_priv *priv);

void iwl_free_txq_mem(struct iwl_priv *priv);

drivers/net/wireless/iwlwifi/iwl3945-base.c

+0 −1
Original line number Diff line number Diff line
@@ -3835,7 +3835,6 @@ static struct ieee80211_ops iwl3945_hw_ops = { 
	.config = iwl_mac_config,

	.configure_filter = iwl_configure_filter,

	.set_key = iwl3945_mac_set_key,

	.get_tx_stats = iwl_mac_get_tx_stats,

	.conf_tx = iwl_mac_conf_tx,

	.reset_tsf = iwl_mac_reset_tsf,

	.bss_info_changed = iwl_bss_info_changed,