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

Commit fe7a90c2 authored by Ron Rindjunsky's avatar Ron Rindjunsky Committed by John W. Linville
Browse files

iwlwifi: iwl-5000 add rxon_assoc 



This patch adds rxon assoc command for 5000 HW.

Signed-off-by: default avatarRon Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 972cf447

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

+48 −0
Original line number Diff line number Diff line
@@ -1250,7 +1250,55 @@ static int iwl5000_hw_valid_rtc_data_addr(u32 addr) 
		(addr < IWL50_RTC_DATA_UPPER_BOUND);

}



static int iwl5000_send_rxon_assoc(struct iwl_priv *priv)

{

	int ret = 0;

	struct iwl5000_rxon_assoc_cmd rxon_assoc;

	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) &&

	    (rxon1->cck_basic_rates == rxon2->cck_basic_rates) &&

	    (rxon1->ofdm_ht_single_stream_basic_rates ==

	     rxon2->ofdm_ht_single_stream_basic_rates) &&

	    (rxon1->ofdm_ht_dual_stream_basic_rates ==

	     rxon2->ofdm_ht_dual_stream_basic_rates) &&

	    (rxon1->ofdm_ht_triple_stream_basic_rates ==

	     rxon2->ofdm_ht_triple_stream_basic_rates) &&

	    (rxon1->acquisition_data == rxon2->acquisition_data) &&

	    (rxon1->rx_chain == rxon2->rx_chain) &&

	    (rxon1->ofdm_basic_rates == rxon2->ofdm_basic_rates)) {

		IWL_DEBUG_INFO("Using current RXON_ASSOC.  Not resending.\n");

		return 0;

	}



	rxon_assoc.flags = priv->staging_rxon.flags;

	rxon_assoc.filter_flags = priv->staging_rxon.filter_flags;

	rxon_assoc.ofdm_basic_rates = priv->staging_rxon.ofdm_basic_rates;

	rxon_assoc.cck_basic_rates = priv->staging_rxon.cck_basic_rates;

	rxon_assoc.reserved1 = 0;

	rxon_assoc.reserved2 = 0;

	rxon_assoc.reserved3 = 0;

	rxon_assoc.ofdm_ht_single_stream_basic_rates =

	    priv->staging_rxon.ofdm_ht_single_stream_basic_rates;

	rxon_assoc.ofdm_ht_dual_stream_basic_rates =

	    priv->staging_rxon.ofdm_ht_dual_stream_basic_rates;

	rxon_assoc.rx_chain_select_flags = priv->staging_rxon.rx_chain;

	rxon_assoc.ofdm_ht_triple_stream_basic_rates =

		 priv->staging_rxon.ofdm_ht_triple_stream_basic_rates;

	rxon_assoc.acquisition_data = priv->staging_rxon.acquisition_data;



	ret = iwl_send_cmd_pdu_async(priv, REPLY_RXON_ASSOC,

				     sizeof(rxon_assoc), &rxon_assoc, NULL);

	if (ret)

		return ret;



	return ret;

}



static struct iwl_hcmd_ops iwl5000_hcmd = {

	.rxon_assoc = iwl5000_send_rxon_assoc,

};



static struct iwl_hcmd_utils_ops iwl5000_hcmd_utils = {

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

+17 −0
Original line number Diff line number Diff line
@@ -630,6 +630,20 @@ struct iwl_rxon_cmd { 
	__le16 reserved6;

} __attribute__ ((packed));



struct iwl5000_rxon_assoc_cmd {

	__le32 flags;

	__le32 filter_flags;

	u8 ofdm_basic_rates;

	u8 cck_basic_rates;

	__le16 reserved1;

	u8 ofdm_ht_single_stream_basic_rates;

	u8 ofdm_ht_dual_stream_basic_rates;

	u8 ofdm_ht_triple_stream_basic_rates;

	u8 reserved2;

	__le16 rx_chain_select_flags;

	__le16 acquisition_data;

	__le32 reserved3;

} __attribute__ ((packed));



/*

 * REPLY_RXON_ASSOC = 0x11 (command, has simple generic response)
@@ -645,6 +659,9 @@ struct iwl4965_rxon_assoc_cmd { 
	__le16 reserved;

} __attribute__ ((packed));









/*

 * REPLY_RXON_TIMING = 0x14 (command, has simple generic response)

 */