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

Commit 17f841cd authored by Samuel Ortiz's avatar Samuel Ortiz Committed by John W. Linville
Browse files

iwl3945: Remaining host command cleanups 



With the recent host command routines merge, we can now look at the various
host command helpers and get rid of the duplicated ones.

Signed-off-by: default avatarSamuel Ortiz <samuel.ortiz@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent af48d048

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

+11 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include "iwl-fh.h"

#include "iwl-3945-fh.h"

#include "iwl-commands.h"

#include "iwl-sta.h"

#include "iwl-3945.h"

#include "iwl-eeprom.h"

#include "iwl-helpers.h"
@@ -895,7 +896,8 @@ u8 iwl3945_sync_sta(struct iwl_priv *priv, int sta_id, u16 tx_rate, u8 flags) 


	spin_unlock_irqrestore(&priv->sta_lock, flags_spin);



	iwl3945_send_add_station(priv, &station->sta, flags);

	iwl_send_add_sta(priv,

			 (struct iwl_addsta_cmd *)&station->sta, flags);

	IWL_DEBUG_RATE("SCALE sync station %d to rate %d\n",

			sta_id, tx_rate);

	return sta_id;
@@ -2376,6 +2378,13 @@ static u16 iwl3945_get_hcmd_size(u8 cmd_id, u16 len) 
	}

}



static u16 iwl3945_build_addsta_hcmd(const struct iwl_addsta_cmd *cmd, u8 *data)

{

	u16 size = (u16)sizeof(struct iwl3945_addsta_cmd);

	memcpy(data, cmd, size);

	return size;

}



/**

 * iwl3945_init_hw_rate_table - Initialize the hardware rate fallback table

 */
@@ -2743,6 +2752,7 @@ static struct iwl_lib_ops iwl3945_lib = { 


static struct iwl_hcmd_utils_ops iwl3945_hcmd_utils = {

	.get_hcmd_size = iwl3945_get_hcmd_size,

	.build_addsta_hcmd = iwl3945_build_addsta_hcmd,

};



static struct iwl_ops iwl3945_ops = {

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

+0 −1
Original line number Diff line number Diff line
@@ -222,7 +222,6 @@ extern int __must_check iwl3945_send_cmd(struct iwl_priv *priv, 
					 struct iwl_host_cmd *cmd);

extern unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv,

					struct ieee80211_hdr *hdr,int left);

extern int iwl3945_send_statistics_request(struct iwl_priv *priv);

extern void iwl3945_set_decrypted_flag(struct iwl_priv *priv, struct sk_buff *skb,

				   u32 decrypt_res,

				   struct ieee80211_rx_status *stats);

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

+0 −14
Original line number Diff line number Diff line
@@ -310,20 +310,6 @@ void iwl_update_chain_flags(struct iwl_priv *priv) 
	iwl_commit_rxon(priv);

}



static int iwl_send_bt_config(struct iwl_priv *priv)

{

	struct iwl_bt_cmd bt_cmd = {

		.flags = 3,

		.lead_time = 0xAA,

		.max_kill = 1,

		.kill_ack_mask = 0,

		.kill_cts_mask = 0,

	};



	return iwl_send_cmd_pdu(priv, REPLY_BT_CONFIG,

				sizeof(struct iwl_bt_cmd), &bt_cmd);

}



static void iwl_clear_free_frames(struct iwl_priv *priv)

{

	struct list_head *element;

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

+15 −0
Original line number Diff line number Diff line
@@ -1007,6 +1007,21 @@ void iwl_enable_interrupts(struct iwl_priv *priv) 
}

EXPORT_SYMBOL(iwl_enable_interrupts);



int iwl_send_bt_config(struct iwl_priv *priv)

{

	struct iwl_bt_cmd bt_cmd = {

		.flags = 3,

		.lead_time = 0xAA,

		.max_kill = 1,

		.kill_ack_mask = 0,

		.kill_cts_mask = 0,

	};



	return iwl_send_cmd_pdu(priv, REPLY_BT_CONFIG,

				sizeof(struct iwl_bt_cmd), &bt_cmd);

}

EXPORT_SYMBOL(iwl_send_bt_config);



int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags)

{

	u32 stat_flags = 0;

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

+2 −0
Original line number Diff line number Diff line
@@ -335,6 +335,7 @@ void iwl_bg_scan_check(struct work_struct *data); 
void iwl_bg_abort_scan(struct work_struct *work);

void iwl_bg_scan_completed(struct work_struct *work);

void iwl_setup_scan_deferred_work(struct iwl_priv *priv);

int iwl_send_scan_abort(struct iwl_priv *priv);



/* For faster active scanning, scan will move to the next channel if fewer than

 * PLCP_QUIET_THRESH packets are heard on this channel within
@@ -468,6 +469,7 @@ static inline int iwl_is_ready_rf(struct iwl_priv *priv) 
}



extern void iwl_rf_kill_ct_config(struct iwl_priv *priv);

extern int iwl_send_bt_config(struct iwl_priv *priv);

extern int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags);

extern int iwl_verify_ucode(struct iwl_priv *priv);

extern int iwl_send_lq_cmd(struct iwl_priv *priv,