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

Commit c1adf9fb authored by Gregory Greenman's avatar Gregory Greenman Committed by John W. Linville
Browse files

iwlwifi: get_hw_cmd_size 



This patch introduces a new handler get_hw_cmd_size in hcmd_utils,
which should adjust the size of the command sent to the microcode
according to the current nic.
It also changes the RXON flow to make usage of this new handler.

The patch also adds iwl_rxon_cmd structure which is supperset for
5000 HW and 4965.

Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8567c63e

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

+13 −2
Original line number Diff line number Diff line
@@ -1857,8 +1857,8 @@ static int iwl4965_send_rxon_assoc(struct iwl_priv *priv) 
{

	int ret = 0;

	struct iwl4965_rxon_assoc_cmd rxon_assoc;

	const struct iwl4965_rxon_cmd *rxon1 = &priv->staging_rxon;

	const struct iwl4965_rxon_cmd *rxon2 = &priv->active_rxon;

	const struct iwl_rxon_cmd *rxon1 = &priv->staging_rxon;

	const struct iwl_rxon_cmd *rxon2 = &priv->active_rxon;



	if ((rxon1->flags == rxon2->flags) &&

	    (rxon1->filter_flags == rxon2->filter_flags) &&
@@ -3743,6 +3743,16 @@ int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw, 
#endif /* CONFIG_IWL4965_HT */





static u16 iwl4965_get_hcmd_size(u8 cmd_id, u16 len)

{

	switch (cmd_id) {

	case REPLY_RXON:

		return (u16) sizeof(struct iwl4965_rxon_cmd);

	default:

		return len;

	}

}



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

{

	struct iwl4965_addsta_cmd *addsta = (struct iwl4965_addsta_cmd *)data;
@@ -3802,6 +3812,7 @@ static struct iwl_hcmd_ops iwl4965_hcmd = { 
};



static struct iwl_hcmd_utils_ops iwl4965_hcmd_utils = {

	.get_hcmd_size = iwl4965_get_hcmd_size,

	.enqueue_hcmd = iwl4965_enqueue_hcmd,

	.build_addsta_hcmd = iwl4965_build_addsta_hcmd,

#ifdef CONFIG_IWL4965_RUN_TIME_CALIB

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

+7 −0
Original line number Diff line number Diff line
@@ -459,10 +459,17 @@ static int iwl5000_disable_tx_fifo(struct iwl_priv *priv) 
	return 0;

}



/* Currently 5000 is the supperset of everything */

static u16 iwl5000_get_hcmd_size(u8 cmd_id, u16 len)

{

	return len;

}



static struct iwl_hcmd_ops iwl5000_hcmd = {

};



static struct iwl_hcmd_utils_ops iwl5000_hcmd_utils = {

	.get_hcmd_size = iwl5000_get_hcmd_size,

	.build_addsta_hcmd = iwl5000_build_addsta_hcmd,

#ifdef CONFIG_IWL5000_RUN_TIME_CALIB

	.gain_computation = iwl5000_gain_computation,

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

+26 −0
Original line number Diff line number Diff line
@@ -600,6 +600,32 @@ struct iwl4965_rxon_cmd { 
	u8 ofdm_ht_dual_stream_basic_rates;

} __attribute__ ((packed));



/* 5000 HW just extend this cmmand */

struct iwl_rxon_cmd {

	u8 node_addr[6];

	__le16 reserved1;

	u8 bssid_addr[6];

	__le16 reserved2;

	u8 wlap_bssid_addr[6];

	__le16 reserved3;

	u8 dev_type;

	u8 air_propagation;

	__le16 rx_chain;

	u8 ofdm_basic_rates;

	u8 cck_basic_rates;

	__le16 assoc_id;

	__le32 flags;

	__le32 filter_flags;

	__le16 channel;

	u8 ofdm_ht_single_stream_basic_rates;

	u8 ofdm_ht_dual_stream_basic_rates;

	u8 ofdm_ht_triple_stream_basic_rates;

	u8 reserved5;

	__le16 acquisition_data;

	__le16 reserved6;

} __attribute__ ((packed));





/*

 * REPLY_RXON_ASSOC = 0x11 (command, has simple generic response)

 */

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

+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ EXPORT_SYMBOL(iwl_is_fat_tx_allowed); 


void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_info *ht_info)

{

	struct iwl4965_rxon_cmd *rxon = &priv->staging_rxon;

	struct iwl_rxon_cmd *rxon = &priv->staging_rxon;

	u32 val;



	if (!ht_info->is_ht)

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

+1 −1
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ struct iwl_hcmd_ops { 
	int (*rxon_assoc)(struct iwl_priv *priv);

};

struct iwl_hcmd_utils_ops {

	u16 (*get_hcmd_size)(u8 cmd_id, u16 len);

	int (*enqueue_hcmd)(struct iwl_priv *priv, struct iwl_host_cmd *cmd);

	u16 (*build_addsta_hcmd)(const struct iwl_addsta_cmd *cmd, u8 *data);

#ifdef CONFIG_IWLWIFI_RUN_TIME_CALIB
@@ -303,5 +304,4 @@ static inline int iwl_send_rxon_assoc(struct iwl_priv *priv) 
	return priv->cfg->ops->hcmd->rxon_assoc(priv);

}





#endif /* __iwl_core_h__ */