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

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

iwlwifi: consolidate station management code 



This patch moves code around and group most of the station
management code into iwl-sta.c

No functional changes (yet)

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cee53ddb

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

+1 −1
Original line number Diff line number Diff line
@@ -1909,7 +1909,7 @@ static int iwl4965_txq_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 */

	iwl_sta_modify_enable_tid_tx(priv, sta_id, tid);

	iwl_sta_tx_modify_enable_tid(priv, sta_id, tid);



	spin_lock_irqsave(&priv->lock, flags);

	ret = iwl_grab_nic_access(priv);

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

+1 −1
Original line number Diff line number Diff line
@@ -969,7 +969,7 @@ static int iwl5000_txq_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 */

	iwl_sta_modify_enable_tid_tx(priv, sta_id, tid);

	iwl_sta_tx_modify_enable_tid(priv, sta_id, tid);



	spin_lock_irqsave(&priv->lock, flags);

	ret = iwl_grab_nic_access(priv);

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

+5 −42
Original line number Diff line number Diff line
@@ -3058,49 +3058,11 @@ static void iwl_mac_update_tkip_key(struct ieee80211_hw *hw, 
			struct ieee80211_key_conf *keyconf, const u8 *addr,

			u32 iv32, u16 *phase1key)

{

	struct iwl_priv *priv = hw->priv;

	u8 sta_id = IWL_INVALID_STATION;

	unsigned long flags;

	__le16 key_flags = 0;

	int i;



	struct iwl_priv *priv = hw->priv;

	IWL_DEBUG_MAC80211("enter\n");



	sta_id = iwl_find_station(priv, addr);

	if (sta_id == IWL_INVALID_STATION) {

		IWL_DEBUG_MAC80211("leave - %pM not in station map.\n",

				   addr);

		return;

	}



	if (iwl_scan_cancel(priv)) {

		/* cancel scan failed, just live w/ bad key and rely

		   briefly on SW decryption */

		return;

	}



	key_flags |= (STA_KEY_FLG_TKIP | STA_KEY_FLG_MAP_KEY_MSK);

	key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS);

	key_flags &= ~STA_KEY_FLG_INVALID;



	if (sta_id == priv->hw_params.bcast_sta_id)

		key_flags |= STA_KEY_MULTICAST_MSK;



	spin_lock_irqsave(&priv->sta_lock, flags);



	priv->stations[sta_id].sta.key.key_flags = key_flags;

	priv->stations[sta_id].sta.key.tkip_rx_tsc_byte2 = (u8) iv32;



	for (i = 0; i < 5; i++)

		priv->stations[sta_id].sta.key.tkip_rx_ttak[i] =

			cpu_to_le16(phase1key[i]);



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

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



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



	spin_unlock_irqrestore(&priv->sta_lock, flags);

	iwl_update_tkip_key(priv, keyconf, addr, iv32, phase1key);



	IWL_DEBUG_MAC80211("leave\n");

}
@@ -3239,10 +3201,10 @@ static int iwl_mac_ampdu_action(struct ieee80211_hw *hw, 
	switch (action) {

	case IEEE80211_AMPDU_RX_START:

		IWL_DEBUG_HT("start Rx\n");

		return iwl_rx_agg_start(priv, sta->addr, tid, *ssn);

		return iwl_sta_rx_agg_start(priv, sta->addr, tid, *ssn);

	case IEEE80211_AMPDU_RX_STOP:

		IWL_DEBUG_HT("stop Rx\n");

		return iwl_rx_agg_stop(priv, sta->addr, tid);

		return iwl_sta_rx_agg_stop(priv, sta->addr, tid);

	case IEEE80211_AMPDU_TX_START:

		IWL_DEBUG_HT("start Tx\n");

		return iwl_tx_agg_start(priv, sta->addr, tid, ssn);
@@ -3256,6 +3218,7 @@ 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)

{

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

+0 −2
Original line number Diff line number Diff line
@@ -206,8 +206,6 @@ int iwl_rx_queue_update_write_ptr(struct iwl_priv *priv, 
void iwl_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq);

void iwl_rx_replenish(struct iwl_priv *priv);

int iwl_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq);

int iwl_rx_agg_start(struct iwl_priv *priv, const u8 *addr, int tid, u16 ssn);

int iwl_rx_agg_stop(struct iwl_priv *priv, const u8 *addr, int tid);

int iwl_rx_queue_restock(struct iwl_priv *priv);

int iwl_rx_queue_space(const struct iwl_rx_queue *q);

void iwl_rx_allocate(struct iwl_priv *priv);

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

+0 −5
Original line number Diff line number Diff line
@@ -574,11 +574,6 @@ struct iwl_hw_params { 
 * iwl4965_mac_     <-- mac80211 callback

 *

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

struct iwl_addsta_cmd;

extern int iwl_send_add_sta(struct iwl_priv *priv,

			    struct iwl_addsta_cmd *sta, u8 flags);

extern u8 iwl_add_station_flags(struct iwl_priv *priv, const u8 *addr,

			int is_ap, u8 flags, struct ieee80211_sta_ht_cap *ht_info);

extern void iwl_update_chain_flags(struct iwl_priv *priv);

extern int iwl_set_pwr_src(struct iwl_priv *priv, enum iwl_pwr_src src);

extern const u8 iwl_bcast_addr[ETH_ALEN];