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

Commit d783b061 authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: move iwl4965_mac_ampdu_action to iwl4965-base.c 



This patch moves iwl4965_mac_ampdu_action to iwl4965-base.c.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ea95bba4

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

+0 −33
Original line number Diff line number Diff line
@@ -2067,39 +2067,6 @@ static int iwl4965_txq_agg_enable(struct iwl_priv *priv, int txq_id, 
	return 0;

}



int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,

			     enum ieee80211_ampdu_mlme_action action,

			     const u8 *addr, u16 tid, u16 *ssn)

{

	struct iwl_priv *priv = hw->priv;

	DECLARE_MAC_BUF(mac);



	IWL_DEBUG_HT("A-MPDU action on addr %s tid %d\n",

		     print_mac(mac, addr), tid);



	if (!(priv->cfg->sku & IWL_SKU_N))

		return -EACCES;



	switch (action) {

	case IEEE80211_AMPDU_RX_START:

		IWL_DEBUG_HT("start Rx\n");

		return iwl_rx_agg_start(priv, addr, tid, *ssn);

	case IEEE80211_AMPDU_RX_STOP:

		IWL_DEBUG_HT("stop Rx\n");

		return iwl_rx_agg_stop(priv, addr, tid);

	case IEEE80211_AMPDU_TX_START:

		IWL_DEBUG_HT("start Tx\n");

		return iwl_tx_agg_start(priv, addr, tid, ssn);

	case IEEE80211_AMPDU_TX_STOP:

		IWL_DEBUG_HT("stop Tx\n");

		return iwl_tx_agg_stop(priv, addr, tid);

	default:

		IWL_DEBUG_HT("unknown\n");

		return -EINVAL;

		break;

	}

	return 0;

}



static u16 iwl4965_get_hcmd_size(u8 cmd_id, u16 len)

{

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

+0 −4
Original line number Diff line number Diff line
@@ -643,10 +643,6 @@ struct iwl_priv; 
 * Forward declare iwl-4965.c functions for iwl-base.c

 */

extern void iwl4965_rf_kill_ct_config(struct iwl_priv *priv);



int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,

				    enum ieee80211_ampdu_mlme_action action,

				    const u8 *addr, u16 tid, u16 *ssn);

int iwl4965_check_empty_hw_queue(struct iwl_priv *priv, int sta_id,

					u8 tid, int txq_id);

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

+34 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
 * NOTE: DRV_NAME is defined in iwlwifi.h for use by iwl-debug.h and printk

 */



#define DRV_DESCRIPTION	"Intel(R) Wireless WiFi Link 4965AGN driver for Linux"

#define DRV_DESCRIPTION	"Intel(R) Wireless WiFi Link AGN driver for Linux"



#ifdef CONFIG_IWLWIFI_DEBUG

#define VD "d"
@@ -3345,6 +3345,39 @@ static int iwl4965_mac_conf_tx(struct ieee80211_hw *hw, u16 queue, 
	return 0;

}



static int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,

			     enum ieee80211_ampdu_mlme_action action,

			     const u8 *addr, u16 tid, u16 *ssn)

{

	struct iwl_priv *priv = hw->priv;

	DECLARE_MAC_BUF(mac);



	IWL_DEBUG_HT("A-MPDU action on addr %s tid %d\n",

		     print_mac(mac, addr), tid);



	if (!(priv->cfg->sku & IWL_SKU_N))

		return -EACCES;



	switch (action) {

	case IEEE80211_AMPDU_RX_START:

		IWL_DEBUG_HT("start Rx\n");

		return iwl_rx_agg_start(priv, addr, tid, *ssn);

	case IEEE80211_AMPDU_RX_STOP:

		IWL_DEBUG_HT("stop Rx\n");

		return iwl_rx_agg_stop(priv, addr, tid);

	case IEEE80211_AMPDU_TX_START:

		IWL_DEBUG_HT("start Tx\n");

		return iwl_tx_agg_start(priv, addr, tid, ssn);

	case IEEE80211_AMPDU_TX_STOP:

		IWL_DEBUG_HT("stop Tx\n");

		return iwl_tx_agg_stop(priv, addr, tid);

	default:

		IWL_DEBUG_HT("unknown\n");

		return -EINVAL;

		break;

	}

	return 0;

}

static int iwl4965_mac_get_tx_stats(struct ieee80211_hw *hw,

				struct ieee80211_tx_queue_stats *stats)

{