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

Commit aa89f31e authored by Abhijeet Kolekar's avatar Abhijeet Kolekar Committed by John W. Linville
Browse files

iwl3945: use iwl_mac_get_tx_stats from iwlwifi 



3945 can now use iwl_mac_get_tx_stats from iwlwifi.

Signed-off-by: default avatarAbhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5ee5811e

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

+0 −35
Original line number Diff line number Diff line
@@ -2223,41 +2223,6 @@ static int iwl_mac_ampdu_action(struct ieee80211_hw *hw, 
	return 0;

}



static 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;

}



static int iwl_mac_get_stats(struct ieee80211_hw *hw,

			     struct ieee80211_low_level_stats *stats)

{

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

+36 −0
Original line number Diff line number Diff line
@@ -2679,6 +2679,42 @@ int iwl_mac_config_interface(struct ieee80211_hw *hw, 
}

EXPORT_SYMBOL(iwl_mac_config_interface);



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);



#ifdef CONFIG_PM



int iwl_pci_suspend(struct pci_dev *pdev, pm_message_t state)

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

+2 −0
Original line number Diff line number Diff line
@@ -284,6 +284,8 @@ void iwl_config_ap(struct iwl_priv *priv); 
int iwl_mac_config_interface(struct ieee80211_hw *hw,

				struct ieee80211_vif *vif,

				struct ieee80211_if_conf *conf);

int iwl_mac_get_tx_stats(struct ieee80211_hw *hw,

			 struct ieee80211_tx_queue_stats *stats);



/*****************************************************

 * RX handlers.

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

+1 −36
Original line number Diff line number Diff line
@@ -3494,41 +3494,6 @@ static int iwl3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
	return ret;

}



static int iwl3945_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;

}



static void iwl3945_mac_reset_tsf(struct ieee80211_hw *hw)

{

	struct iwl_priv *priv = hw->priv;
@@ -4116,7 +4081,7 @@ static struct ieee80211_ops iwl3945_hw_ops = { 
	.config_interface = iwl_mac_config_interface,

	.configure_filter = iwl_configure_filter,

	.set_key = iwl3945_mac_set_key,

	.get_tx_stats = iwl3945_mac_get_tx_stats,

	.get_tx_stats = iwl_mac_get_tx_stats,

	.conf_tx = iwl_mac_conf_tx,

	.reset_tsf = iwl3945_mac_reset_tsf,

	.bss_info_changed = iwl_bss_info_changed,