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

Commit 77b5621b authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Don't use queue entry as parameter when creating TX descriptor. 



The functions that create the tx descriptor structure do not operate on
a queue entry at all. Signal this fact in the code by not providing a
queue entry as a parameter, but the rt2x00 device structure and the skb
directly.

This patch is a preparation for reducing the time a queue is locked for
a tx operation.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Acked-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 77a861c4

drivers/net/wireless/rt2x00/rt2x00crypto.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -45,11 +45,11 @@ enum cipher rt2x00crypto_key_to_cipher(struct ieee80211_key_conf *key) 
	}

	}

}

}





void rt2x00crypto_create_tx_descriptor(struct queue_entry *entry,

void rt2x00crypto_create_tx_descriptor(struct rt2x00_dev *rt2x00dev,

				       struct sk_buff *skb,

				       struct txentry_desc *txdesc)

				       struct txentry_desc *txdesc)

{

{

	struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;

	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);

	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(entry->skb);

	struct ieee80211_key_conf *hw_key = tx_info->control.hw_key;

	struct ieee80211_key_conf *hw_key = tx_info->control.hw_key;





	if (!test_bit(CAPABILITY_HW_CRYPTO, &rt2x00dev->cap_flags) || !hw_key)

	if (!test_bit(CAPABILITY_HW_CRYPTO, &rt2x00dev->cap_flags) || !hw_key)

drivers/net/wireless/rt2x00/rt2x00lib.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -336,7 +336,8 @@ static inline void rt2x00debug_update_crypto(struct rt2x00_dev *rt2x00dev, 
 */

 */

#ifdef CONFIG_RT2X00_LIB_CRYPTO

#ifdef CONFIG_RT2X00_LIB_CRYPTO

enum cipher rt2x00crypto_key_to_cipher(struct ieee80211_key_conf *key);

enum cipher rt2x00crypto_key_to_cipher(struct ieee80211_key_conf *key);

void rt2x00crypto_create_tx_descriptor(struct queue_entry *entry,

void rt2x00crypto_create_tx_descriptor(struct rt2x00_dev *rt2x00dev,

				       struct sk_buff *skb,

				       struct txentry_desc *txdesc);

				       struct txentry_desc *txdesc);

unsigned int rt2x00crypto_tx_overhead(struct rt2x00_dev *rt2x00dev,

unsigned int rt2x00crypto_tx_overhead(struct rt2x00_dev *rt2x00dev,

				      struct sk_buff *skb);

				      struct sk_buff *skb);

drivers/net/wireless/rt2x00/rt2x00queue.c

+28 −24
Original line number Original line Diff line number Diff line
@@ -200,11 +200,12 @@ void rt2x00queue_remove_l2pad(struct sk_buff *skb, unsigned int header_length) 
	skb_pull(skb, l2pad);

	skb_pull(skb, l2pad);

}

}





static void rt2x00queue_create_tx_descriptor_seq(struct queue_entry *entry,

static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,

						 struct sk_buff *skb,

						 struct txentry_desc *txdesc)

						 struct txentry_desc *txdesc)

{

{

	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(entry->skb);

	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)entry->skb->data;

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct rt2x00_intf *intf = vif_to_intf(tx_info->control.vif);

	struct rt2x00_intf *intf = vif_to_intf(tx_info->control.vif);





	if (!(tx_info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ))

	if (!(tx_info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ))
@@ -212,7 +213,7 @@ static void rt2x00queue_create_tx_descriptor_seq(struct queue_entry *entry, 




	__set_bit(ENTRY_TXD_GENERATE_SEQ, &txdesc->flags);

	__set_bit(ENTRY_TXD_GENERATE_SEQ, &txdesc->flags);





	if (!test_bit(REQUIRE_SW_SEQNO, &entry->queue->rt2x00dev->cap_flags))

	if (!test_bit(REQUIRE_SW_SEQNO, &rt2x00dev->cap_flags))

		return;

		return;





	/*

	/*
@@ -237,12 +238,12 @@ static void rt2x00queue_create_tx_descriptor_seq(struct queue_entry *entry, 




}

}





static void rt2x00queue_create_tx_descriptor_plcp(struct queue_entry *entry,

static void rt2x00queue_create_tx_descriptor_plcp(struct rt2x00_dev *rt2x00dev,

						  struct sk_buff *skb,

						  struct txentry_desc *txdesc,

						  struct txentry_desc *txdesc,

						  const struct rt2x00_rate *hwrate)

						  const struct rt2x00_rate *hwrate)

{

{

	struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;

	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);

	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(entry->skb);

	struct ieee80211_tx_rate *txrate = &tx_info->control.rates[0];

	struct ieee80211_tx_rate *txrate = &tx_info->control.rates[0];

	unsigned int data_length;

	unsigned int data_length;

	unsigned int duration;

	unsigned int duration;
@@ -259,8 +260,8 @@ static void rt2x00queue_create_tx_descriptor_plcp(struct queue_entry *entry, 
		txdesc->u.plcp.ifs = IFS_SIFS;

		txdesc->u.plcp.ifs = IFS_SIFS;





	/* Data length + CRC + Crypto overhead (IV/EIV/ICV/MIC) */

	/* Data length + CRC + Crypto overhead (IV/EIV/ICV/MIC) */

	data_length = entry->skb->len + 4;

	data_length = skb->len + 4;

	data_length += rt2x00crypto_tx_overhead(rt2x00dev, entry->skb);

	data_length += rt2x00crypto_tx_overhead(rt2x00dev, skb);





	/*

	/*

	 * PLCP setup

	 * PLCP setup
@@ -301,13 +302,14 @@ static void rt2x00queue_create_tx_descriptor_plcp(struct queue_entry *entry, 
	}

	}

}

}





static void rt2x00queue_create_tx_descriptor_ht(struct queue_entry *entry,

static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev,

						struct sk_buff *skb,

						struct txentry_desc *txdesc,

						struct txentry_desc *txdesc,

						const struct rt2x00_rate *hwrate)

						const struct rt2x00_rate *hwrate)

{

{

	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(entry->skb);

	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);

	struct ieee80211_tx_rate *txrate = &tx_info->control.rates[0];

	struct ieee80211_tx_rate *txrate = &tx_info->control.rates[0];

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)entry->skb->data;

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;





	if (tx_info->control.sta)

	if (tx_info->control.sta)

		txdesc->u.ht.mpdu_density =

		txdesc->u.ht.mpdu_density =
@@ -380,12 +382,12 @@ static void rt2x00queue_create_tx_descriptor_ht(struct queue_entry *entry, 
		txdesc->u.ht.txop = TXOP_HTTXOP;

		txdesc->u.ht.txop = TXOP_HTTXOP;

}

}





static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry,

static void rt2x00queue_create_tx_descriptor(struct rt2x00_dev *rt2x00dev,

					     struct sk_buff *skb,

					     struct txentry_desc *txdesc)

					     struct txentry_desc *txdesc)

{

{

	struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;

	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);

	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(entry->skb);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)entry->skb->data;

	struct ieee80211_tx_rate *txrate = &tx_info->control.rates[0];

	struct ieee80211_tx_rate *txrate = &tx_info->control.rates[0];

	struct ieee80211_rate *rate;

	struct ieee80211_rate *rate;

	const struct rt2x00_rate *hwrate = NULL;

	const struct rt2x00_rate *hwrate = NULL;
@@ -395,8 +397,8 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry, 
	/*

	/*

	 * Header and frame information.

	 * Header and frame information.

	 */

	 */

	txdesc->length = entry->skb->len;

	txdesc->length = skb->len;

	txdesc->header_length = ieee80211_get_hdrlen_from_skb(entry->skb);

	txdesc->header_length = ieee80211_get_hdrlen_from_skb(skb);





	/*

	/*

	 * Check whether this frame is to be acked.

	 * Check whether this frame is to be acked.
@@ -471,13 +473,15 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry, 
	/*

	/*

	 * Apply TX descriptor handling by components

	 * Apply TX descriptor handling by components

	 */

	 */

	rt2x00crypto_create_tx_descriptor(entry, txdesc);

	rt2x00crypto_create_tx_descriptor(rt2x00dev, skb, txdesc);

	rt2x00queue_create_tx_descriptor_seq(entry, txdesc);

	rt2x00queue_create_tx_descriptor_seq(rt2x00dev, skb, txdesc);





	if (test_bit(REQUIRE_HT_TX_DESC, &rt2x00dev->cap_flags))

	if (test_bit(REQUIRE_HT_TX_DESC, &rt2x00dev->cap_flags))

		rt2x00queue_create_tx_descriptor_ht(entry, txdesc, hwrate);

		rt2x00queue_create_tx_descriptor_ht(rt2x00dev, skb, txdesc,

						    hwrate);

	else

	else

		rt2x00queue_create_tx_descriptor_plcp(entry, txdesc, hwrate);

		rt2x00queue_create_tx_descriptor_plcp(rt2x00dev, skb, txdesc,

						      hwrate);

}

}





static int rt2x00queue_write_tx_data(struct queue_entry *entry,

static int rt2x00queue_write_tx_data(struct queue_entry *entry,
@@ -588,7 +592,7 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb, 
	 * for our information.

	 * for our information.

	 */

	 */

	entry->skb = skb;

	entry->skb = skb;

	rt2x00queue_create_tx_descriptor(entry, &txdesc);

	rt2x00queue_create_tx_descriptor(queue->rt2x00dev, skb, &txdesc);





	/*

	/*

	 * All information is retrieved from the skb->cb array,

	 * All information is retrieved from the skb->cb array,
@@ -707,7 +711,7 @@ int rt2x00queue_update_beacon_locked(struct rt2x00_dev *rt2x00dev, 
	 * after that we are free to use the skb->cb array

	 * after that we are free to use the skb->cb array

	 * for our information.

	 * for our information.

	 */

	 */

	rt2x00queue_create_tx_descriptor(intf->beacon, &txdesc);

	rt2x00queue_create_tx_descriptor(rt2x00dev, intf->beacon->skb, &txdesc);





	/*

	/*

	 * Fill in skb descriptor

	 * Fill in skb descriptor