iwlwifi: remove 4965 from alive_resp structures (885ba202) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -373,7 +373,7 @@ struct iwl4965_tx_power_db {
	* 3) Tx gain compensation to balance 4965's 2 Tx chains for MIMO operation,		* 3) Tx gain compensation to balance 4965's 2 Tx chains for MIMO operation,
	* for each of 5 frequency ranges.		* for each of 5 frequency ranges.
	*/		*/
	struct iwl4965_init_alive_resp {		struct iwl_init_alive_resp {
	u8 ucode_minor;		u8 ucode_minor;
	u8 ucode_major;		u8 ucode_major;
	__le16 reserved1;		__le16 reserved1;
	@@ -449,7 +449,7 @@ struct iwl4965_init_alive_resp {
	* The Linux driver can print both logs to the system log when a uCode error		* The Linux driver can print both logs to the system log when a uCode error
	* occurs.		* occurs.
	*/		*/
	struct iwl4965_alive_resp {		struct iwl_alive_resp {
	u8 ucode_minor;		u8 ucode_minor;
	u8 ucode_major;		u8 ucode_major;
	__le16 reserved1;		__le16 reserved1;
	@@ -473,7 +473,7 @@ union tsf {
	/*		/*
	* REPLY_ERROR = 0x2 (response only, not a command)		* REPLY_ERROR = 0x2 (response only, not a command)
	*/		*/
	struct iwl4965_error_resp {		struct iwl_error_resp {
	__le32 error_type;		__le32 error_type;
	u8 cmd_id;		u8 cmd_id;
	u8 reserved1;		u8 reserved1;
	@@ -2861,12 +2861,12 @@ struct iwl_rx_packet {
	__le32 len;		__le32 len;
	struct iwl_cmd_header hdr;		struct iwl_cmd_header hdr;
	union {		union {
	struct iwl4965_alive_resp alive_frame;		struct iwl_alive_resp alive_frame;
	struct iwl4965_rx_frame rx_frame;		struct iwl4965_rx_frame rx_frame;
	struct iwl4965_tx_resp tx_resp;		struct iwl4965_tx_resp tx_resp;
	struct iwl4965_spectrum_notification spectrum_notif;		struct iwl4965_spectrum_notification spectrum_notif;
	struct iwl4965_csa_notification csa_notif;		struct iwl4965_csa_notification csa_notif;
	struct iwl4965_error_resp err_resp;		struct iwl_error_resp err_resp;
	struct iwl4965_card_state_notif card_state_notif;		struct iwl4965_card_state_notif card_state_notif;
	struct iwl4965_beacon_notif beacon_status;		struct iwl4965_beacon_notif beacon_status;
	struct iwl4965_add_sta_resp add_sta;		struct iwl4965_add_sta_resp add_sta;

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1035,8 +1035,8 @@ struct iwl_priv {

	/* 1st responses from initialize and runtime uCode images.		/* 1st responses from initialize and runtime uCode images.
	* 4965's initialize alive response contains some calibration data. */		* 4965's initialize alive response contains some calibration data. */
	struct iwl4965_init_alive_resp card_alive_init;		struct iwl_init_alive_resp card_alive_init;
	struct iwl4965_alive_resp card_alive;		struct iwl_alive_resp card_alive;
	#ifdef CONFIG_IWLWIFI_RFKILL		#ifdef CONFIG_IWLWIFI_RFKILL
	struct iwl_rfkill_mngr rfkill_mngr;		struct iwl_rfkill_mngr rfkill_mngr;
	#endif		#endif

drivers/net/wireless/iwlwifi/iwl4965-base.c

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1927,11 +1927,11 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
	}		}


	static void iwl4965_rx_reply_alive(struct iwl_priv *priv,		static void iwl_rx_reply_alive(struct iwl_priv *priv,
	struct iwl_rx_mem_buffer *rxb)		struct iwl_rx_mem_buffer *rxb)
	{		{
	struct iwl_rx_packet pkt = (struct iwl_rx_packet )rxb->skb->data;		struct iwl_rx_packet pkt = (struct iwl_rx_packet )rxb->skb->data;
	struct iwl4965_alive_resp *palive;		struct iwl_alive_resp *palive;
	struct delayed_work *pwork;		struct delayed_work *pwork;

	palive = &pkt->u.alive_frame;		palive = &pkt->u.alive_frame;
	@@ -1945,12 +1945,12 @@ static void iwl4965_rx_reply_alive(struct iwl_priv *priv,
	IWL_DEBUG_INFO("Initialization Alive received.\n");		IWL_DEBUG_INFO("Initialization Alive received.\n");
	memcpy(&priv->card_alive_init,		memcpy(&priv->card_alive_init,
	&pkt->u.alive_frame,		&pkt->u.alive_frame,
	sizeof(struct iwl4965_init_alive_resp));		sizeof(struct iwl_init_alive_resp));
	pwork = &priv->init_alive_start;		pwork = &priv->init_alive_start;
	} else {		} else {
	IWL_DEBUG_INFO("Runtime Alive received.\n");		IWL_DEBUG_INFO("Runtime Alive received.\n");
	memcpy(&priv->card_alive, &pkt->u.alive_frame,		memcpy(&priv->card_alive, &pkt->u.alive_frame,
	sizeof(struct iwl4965_alive_resp));		sizeof(struct iwl_alive_resp));
	pwork = &priv->alive_start;		pwork = &priv->alive_start;
	}		}

	@@ -2279,7 +2279,7 @@ static void iwl4965_rx_card_state_notif(struct iwl_priv *priv,
	*/		*/
	static void iwl4965_setup_rx_handlers(struct iwl_priv *priv)		static void iwl4965_setup_rx_handlers(struct iwl_priv *priv)
	{		{
	priv->rx_handlers[REPLY_ALIVE] = iwl4965_rx_reply_alive;		priv->rx_handlers[REPLY_ALIVE] = iwl_rx_reply_alive;
	priv->rx_handlers[REPLY_ADD_STA] = iwl4965_rx_reply_add_sta;		priv->rx_handlers[REPLY_ADD_STA] = iwl4965_rx_reply_add_sta;
	priv->rx_handlers[REPLY_ERROR] = iwl4965_rx_reply_error;		priv->rx_handlers[REPLY_ERROR] = iwl4965_rx_reply_error;
	priv->rx_handlers[CHANNEL_SWITCH_NOTIFICATION] = iwl4965_rx_csa;		priv->rx_handlers[CHANNEL_SWITCH_NOTIFICATION] = iwl4965_rx_csa;
	@@ -3423,7 +3423,7 @@ static void __iwl4965_down(struct iwl_priv *priv)
	priv->cfg->ops->lib->free_shared_mem(priv);		priv->cfg->ops->lib->free_shared_mem(priv);

	exit:		exit:
	memset(&priv->card_alive, 0, sizeof(struct iwl4965_alive_resp));		memset(&priv->card_alive, 0, sizeof(struct iwl_alive_resp));

	if (priv->ibss_beacon)		if (priv->ibss_beacon)
	dev_kfree_skb(priv->ibss_beacon);		dev_kfree_skb(priv->ibss_beacon);
	@@ -5075,7 +5075,7 @@ static ssize_t show_version(struct device *d,
	struct device_attribute attr, char buf)		struct device_attribute attr, char buf)
	{		{
	struct iwl_priv *priv = d->driver_data;		struct iwl_priv *priv = d->driver_data;
	struct iwl4965_alive_resp *palive = &priv->card_alive;		struct iwl_alive_resp *palive = &priv->card_alive;

	if (palive->is_valid)		if (palive->is_valid)
	return sprintf(buf, "fw version: 0x%01X.0x%01X.0x%01X.0x%01X\n"		return sprintf(buf, "fw version: 0x%01X.0x%01X.0x%01X.0x%01X\n"