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

Commit c90cbbbd authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlwifi: add context into tx descriptor 



In status processing we'll need to find the context
for a given frame, so add a context pointer to the
TX info for each frame.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 8dfdb9d5

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

+1 −0
Original line number Diff line number Diff line
@@ -640,6 +640,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
	/* Set up driver data for this TFD */

	memset(&(txq->txb[q->write_ptr]), 0, sizeof(struct iwl_tx_info));

	txq->txb[q->write_ptr].skb = skb;

	txq->txb[q->write_ptr].ctx = ctx;



	/* Set up first empty entry in queue's array of Tx/cmd buffers */

	out_cmd = txq->cmd[q->write_ptr];

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

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ struct iwl_queue { 
/* One for each TFD */

struct iwl_tx_info {

	struct sk_buff *skb;

	struct iwl_rxon_context *ctx;

};



/**

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

+1 −0
Original line number Diff line number Diff line
@@ -544,6 +544,7 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
	/* Set up driver data for this TFD */

	memset(&(txq->txb[q->write_ptr]), 0, sizeof(struct iwl_tx_info));

	txq->txb[q->write_ptr].skb = skb;

	txq->txb[q->write_ptr].ctx = &priv->contexts[IWL_RXON_CTX_BSS];



	/* Init first empty entry in queue's array of Tx/cmd buffers */

	out_cmd = txq->cmd[idx];