Commit 65b94a4a authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: pass response packet directly 



When CMD_WANT_SKB is set for a (synchronous)
command, the response is passed back to the
caller which is then responsible for freeing
it. Make this more abstract with real API,
passing directly the response packet in the
new cmd.resp_pkt member and also introduce
iwl_free_resp() to free the pages -- this
way the upper layers don't have to directly
touch the page implementation.

NOTE: This breaks IDI -- the new code isn't reflected there yet!

Signed-off-by: default avatarJohannes Berg <johannes.berg@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 2c6ab7ff

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

+3 −3
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ int iwl_send_add_sta(struct iwl_priv *priv, 
	/*else the command was successfully sent in SYNC mode, need to free

	 * the reply page */



	iwl_free_pages(priv->shrd, cmd.reply_page);

	iwl_free_resp(&cmd);



	if (cmd.handler_status)

		IWL_ERR(priv, "%s - error in the CMD response %d", __func__,
@@ -415,7 +415,7 @@ static int iwl_send_remove_station(struct iwl_priv *priv, 
	if (ret)

		return ret;



	pkt = (struct iwl_rx_packet *)cmd.reply_page;

	pkt = cmd.resp_pkt;

	if (pkt->hdr.flags & IWL_CMD_FAILED_MSK) {

		IWL_ERR(priv, "Bad return from REPLY_REMOVE_STA (0x%08X)\n",

			  pkt->hdr.flags);
@@ -438,7 +438,7 @@ static int iwl_send_remove_station(struct iwl_priv *priv, 
			break;

		}

	}

	iwl_free_pages(priv->shrd, cmd.reply_page);

	iwl_free_resp(&cmd);



	return ret;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static int iwl_send_scan_abort(struct iwl_priv *priv) 
	if (ret)

		return ret;



	pkt = (struct iwl_rx_packet *)cmd.reply_page;

	pkt = cmd.resp_pkt;

	if (pkt->u.status != CAN_ABORT_STATUS) {

		/* The scan abort will return 1 for success or

		 * 2 for "failure".  A failure condition can be
@@ -88,7 +88,7 @@ static int iwl_send_scan_abort(struct iwl_priv *priv) 
		ret = -EIO;

	}



	iwl_free_pages(priv->shrd, cmd.reply_page);

	iwl_free_resp(&cmd);

	return ret;

}

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

+0 −5
Original line number Diff line number Diff line
@@ -413,11 +413,6 @@ static inline bool iwl_have_debug_level(u32 level) 
	return iwlagn_mod_params.debug_level & level;

}



static inline void iwl_free_pages(struct iwl_shared *shrd, unsigned long page)

{

	free_pages(page, shrd->hw_params.rx_page_order);

}



/**

 * iwl_queue_inc_wrap - increment queue index, wrap back to beginning

 * @index -- current index

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

+2 −2
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static int iwl_testmode_ucode(struct ieee80211_hw *hw, struct nlattr **tb) 
		return ret;



	/* Handling return of SKB to the user */

	pkt = (struct iwl_rx_packet *)cmd.reply_page;

	pkt = cmd.resp_pkt;

	if (!pkt) {

		IWL_ERR(priv, "HCMD received a null response packet\n");

		return ret;
@@ -309,7 +309,7 @@ static int iwl_testmode_ucode(struct ieee80211_hw *hw, struct nlattr **tb) 


	/* The reply is in a page, that we cannot send to user space. */

	memcpy(reply_buf, &(pkt->hdr), reply_len);

	iwl_free_pages(priv->shrd, cmd.reply_page);

	iwl_free_resp(&cmd);



	NLA_PUT_U32(skb, IWL_TM_ATTR_COMMAND, IWL_TM_CMD_DEV2APP_UCODE_RX_PKT);

	NLA_PUT(skb, IWL_TM_ATTR_UCODE_RX_PKT, reply_len, reply_buf);

drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c

+10 −6
Original line number Diff line number Diff line
@@ -879,9 +879,13 @@ void iwl_tx_cmd_complete(struct iwl_trans *trans, struct iwl_rx_mem_buffer *rxb, 


	/* Input error checking is done when commands are added to queue. */

	if (meta->flags & CMD_WANT_SKB) {

		meta->source->reply_page = (unsigned long)rxb_addr(rxb);

		meta->source->handler_status = handler_status;

		struct page *p = rxb->page;



		rxb->page = NULL;

		meta->source->resp_pkt = pkt;

		meta->source->_rx_page_addr = (unsigned long)page_address(p);

		meta->source->_rx_page_order = hw_params(trans).rx_page_order;

		meta->source->handler_status = handler_status;

	}



	iwl_hcmd_queue_reclaim(trans, txq_id, index);
@@ -985,7 +989,7 @@ static int iwl_send_cmd_sync(struct iwl_trans *trans, struct iwl_host_cmd *cmd) 
		}

	}



	if ((cmd->flags & CMD_WANT_SKB) && !cmd->reply_page) {

	if ((cmd->flags & CMD_WANT_SKB) && !cmd->resp_pkt) {

		IWL_ERR(trans, "Error: Response NULL in '%s'\n",

			  get_cmd_string(cmd->id));

		ret = -EIO;
@@ -1006,9 +1010,9 @@ static int iwl_send_cmd_sync(struct iwl_trans *trans, struct iwl_host_cmd *cmd) 
							~CMD_WANT_SKB;

	}



	if (cmd->reply_page) {

		iwl_free_pages(trans->shrd, cmd->reply_page);

		cmd->reply_page = 0;

	if (cmd->resp_pkt) {

		iwl_free_resp(cmd);

		cmd->resp_pkt = NULL;

	}



	return ret;