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

Commit 247c61d6 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlagn: remove the callback in host commands 



Before this patch, the upper layer could register a callback for each
host command. This mechanism allowed the upper layer to have
different callbacks for the same command ID. In fact, it wasn't used
and the rx_handlers is enough: same callback for all the command with
a specific command ID.

The iwl_send_add_station needs the access the command that was sent
while handling the response (regardless if the command was sent in
SYNC or ASYNC mode). So now, all the handlers receive the host
command that was sent. This implies a change in the handler signature.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 390808db

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

+5 −3
Original line number Diff line number Diff line
@@ -705,8 +705,9 @@ static void iwlagn_set_kill_msk(struct iwl_priv *priv, 
	}

}



void iwlagn_bt_coex_profile_notif(struct iwl_priv *priv,

					     struct iwl_rx_mem_buffer *rxb)

int iwlagn_bt_coex_profile_notif(struct iwl_priv *priv,

				  struct iwl_rx_mem_buffer *rxb,

				  struct iwl_device_cmd *cmd)

{

	unsigned long flags;

	struct iwl_rx_packet *pkt = rxb_addr(rxb);
@@ -715,7 +716,7 @@ void iwlagn_bt_coex_profile_notif(struct iwl_priv *priv, 


	if (priv->bt_enable_flag == IWLAGN_BT_FLAG_COEX_MODE_DISABLED) {

		/* bt coex disabled */

		return;

		return 0;

	}



	IWL_DEBUG_COEX(priv, "BT Coex notification:\n");
@@ -757,6 +758,7 @@ void iwlagn_bt_coex_profile_notif(struct iwl_priv *priv, 
	spin_lock_irqsave(&priv->shrd->lock, flags);

	priv->bt_ci_compliance = coex->bt_ci_compliance;

	spin_unlock_irqrestore(&priv->shrd->lock, flags);

	return 0;

}



void iwlagn_bt_rx_handler_setup(struct iwl_priv *priv)

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

+10 −6
Original line number Diff line number Diff line
@@ -736,7 +736,8 @@ static void iwl_check_abort_status(struct iwl_priv *priv, 
	}

}



void iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)

int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb,

			       struct iwl_device_cmd *cmd)

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	u16 sequence = le16_to_cpu(pkt->hdr.sequence);
@@ -824,6 +825,7 @@ void iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb) 


	iwl_check_abort_status(priv, tx_resp->frame_count, status);

	spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);

	return 0;

}



/**
@@ -832,8 +834,9 @@ void iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb) 
 * Handles block-acknowledge notification from device, which reports success

 * of frames sent via aggregation.

 */

void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,

					   struct iwl_rx_mem_buffer *rxb)

int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,

				   struct iwl_rx_mem_buffer *rxb,

				   struct iwl_device_cmd *cmd)

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct iwl_compressed_ba_resp *ba_resp = &pkt->u.compressed_ba;
@@ -857,7 +860,7 @@ void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv, 
	if (scd_flow >= hw_params(priv).max_txq_num) {

		IWL_ERR(priv,

			"BUG_ON scd_flow is bigger than number of queues\n");

		return;

		return 0;

	}



	sta_id = ba_resp->sta_id;
@@ -877,14 +880,14 @@ void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv, 
			"BA scd_flow %d does not match txq_id %d\n",

			scd_flow, agg->txq_id);

		spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);

		return;

		return 0;

	}



	if (unlikely(!agg->wait_for_ba)) {

		if (unlikely(ba_resp->bitmap))

			IWL_ERR(priv, "Received BA when not expected\n");

		spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);

		return;

		return 0;

	}



	IWL_DEBUG_TX_REPLY(priv, "REPLY_COMPRESSED_BA [%d] Received from %pM, "
@@ -955,4 +958,5 @@ void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv, 
	}



	spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);

	return 0;

}

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

+5 −3
Original line number Diff line number Diff line
@@ -228,8 +228,9 @@ static int iwlagn_send_calib_cfg(struct iwl_priv *priv) 
	return iwl_trans_send_cmd(trans(priv), &cmd);

}



void iwlagn_rx_calib_result(struct iwl_priv *priv,

			     struct iwl_rx_mem_buffer *rxb)

int iwlagn_rx_calib_result(struct iwl_priv *priv,

			    struct iwl_rx_mem_buffer *rxb,

			    struct iwl_device_cmd *cmd)

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct iwl_calib_hdr *hdr = (struct iwl_calib_hdr *)pkt->u.raw;
@@ -262,9 +263,10 @@ void iwlagn_rx_calib_result(struct iwl_priv *priv, 
	default:

		IWL_ERR(priv, "Unknown calibration notification %d\n",

			  hdr->op_code);

		return;

		return -1;

	}

	iwl_calib_set(&priv->calib_results[index], pkt->u.raw, len);

	return 0;

}



int iwlagn_init_alive_start(struct iwl_priv *priv)

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

+11 −7
Original line number Diff line number Diff line
@@ -88,8 +88,9 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw, 
			     u32 changes);



/* uCode */

void iwlagn_rx_calib_result(struct iwl_priv *priv,

			 struct iwl_rx_mem_buffer *rxb);

int iwlagn_rx_calib_result(struct iwl_priv *priv,

			    struct iwl_rx_mem_buffer *rxb,

			    struct iwl_device_cmd *cmd);

int iwlagn_send_bt_env(struct iwl_priv *priv, u8 action, u8 type);

void iwlagn_send_prio_tbl(struct iwl_priv *priv);

int iwlagn_run_init_ucode(struct iwl_priv *priv);
@@ -116,9 +117,11 @@ int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif, 
			struct ieee80211_sta *sta, u16 tid, u16 *ssn);

int iwlagn_tx_agg_stop(struct iwl_priv *priv, struct ieee80211_vif *vif,

		       struct ieee80211_sta *sta, u16 tid);

void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,

				struct iwl_rx_mem_buffer *rxb);

void iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb);

int iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,

				   struct iwl_rx_mem_buffer *rxb,

				   struct iwl_device_cmd *cmd);

int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb,

			       struct iwl_device_cmd *cmd);



static inline u32 iwl_tx_status_to_mac80211(u32 status)

{
@@ -155,8 +158,9 @@ int iwlagn_manage_ibss_station(struct iwl_priv *priv, 


/* bt coex */

void iwlagn_send_advance_bt_config(struct iwl_priv *priv);

void iwlagn_bt_coex_profile_notif(struct iwl_priv *priv,

				  struct iwl_rx_mem_buffer *rxb);

int iwlagn_bt_coex_profile_notif(struct iwl_priv *priv,

				  struct iwl_rx_mem_buffer *rxb,

				  struct iwl_device_cmd *cmd);

void iwlagn_bt_rx_handler_setup(struct iwl_priv *priv);

void iwlagn_bt_setup_deferred_work(struct iwl_priv *priv);

void iwlagn_bt_cancel_deferred_work(struct iwl_priv *priv);

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

+3 −2
Original line number Diff line number Diff line
@@ -841,8 +841,9 @@ struct iwl_priv { 


	void (*pre_rx_handler)(struct iwl_priv *priv,

			       struct iwl_rx_mem_buffer *rxb);

	void (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv,

				       struct iwl_rx_mem_buffer *rxb);

	int (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv,

				       struct iwl_rx_mem_buffer *rxb,

				       struct iwl_device_cmd *cmd);



	struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];