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

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

iwlwifi: move iwl_sta_modify_enable_tid_tx to iwl-sta.c 



This patch moves iwl_sta_modify_enable_tid_tx into iwl-sta.c.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fe7a90c2

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

+2 −19
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include "iwl-io.h"

#include "iwl-helpers.h"

#include "iwl-calib.h"

#include "iwl-sta.h"



/* module parameters */

static struct iwl_mod_params iwl4965_mod_params = {
@@ -2899,24 +2900,6 @@ static void iwl4965_rx_reply_rx_phy(struct iwl_priv *priv, 


#ifdef CONFIG_IWL4965_HT



/**

 * iwl4965_sta_modify_enable_tid_tx - Enable Tx for this TID in station table

 */

static void iwl4965_sta_modify_enable_tid_tx(struct iwl_priv *priv,

					 int sta_id, int tid)

{

	unsigned long flags;



	/* Remove "disable" flag, to enable Tx for this TID */

	spin_lock_irqsave(&priv->sta_lock, flags);

	priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_TID_DISABLE_TX;

	priv->stations[sta_id].sta.tid_disable_tx &= cpu_to_le16(~(1 << tid));

	priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;

	spin_unlock_irqrestore(&priv->sta_lock, flags);



	iwl_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC);

}



/**

 * iwl4965_tx_status_reply_compressed_ba - Update tx status from block-ack

 *
@@ -3193,7 +3176,7 @@ static int iwl4965_tx_queue_agg_enable(struct iwl_priv *priv, int txq_id, 
	ra_tid = BUILD_RAxTID(sta_id, tid);



	/* Modify device's station table to Tx this TID */

	iwl4965_sta_modify_enable_tid_tx(priv, sta_id, tid);

	iwl_sta_modify_enable_tid_tx(priv, sta_id, tid);



	spin_lock_irqsave(&priv->lock, flags);

	rc = iwl_grab_nic_access(priv);

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

+20 −0
Original line number Diff line number Diff line
@@ -921,3 +921,23 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr) 
}

EXPORT_SYMBOL(iwl_get_sta_id);





/**

 * iwl_sta_modify_enable_tid_tx - Enable Tx for this TID in station table

 */

void iwl_sta_modify_enable_tid_tx(struct iwl_priv *priv, int sta_id, int tid)

{

	unsigned long flags;



	/* Remove "disable" flag, to enable Tx for this TID */

	spin_lock_irqsave(&priv->sta_lock, flags);

	priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_TID_DISABLE_TX;

	priv->stations[sta_id].sta.tid_disable_tx &= cpu_to_le16(~(1 << tid));

	priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;

	spin_unlock_irqrestore(&priv->sta_lock, flags);



	iwl_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC);

}

EXPORT_SYMBOL(iwl_sta_modify_enable_tid_tx);

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

+1 −0
Original line number Diff line number Diff line
@@ -45,4 +45,5 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv, 
int iwl_rxon_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap);

u8 iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap);

int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr);

void iwl_sta_modify_enable_tid_tx(struct iwl_priv *priv, int sta_id, int tid);

#endif /* __iwl_sta_h__ */