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

Commit 61486e0f authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Remove ieee80211_tx_control argument from write_tx_desc() 



Move the last remaining information details read from ieee80211_tx_control
in the drivers to the txentry_desc structure. After this we can
remove ieee80211_tx_control from the argument list for the callback function,
which makes it easier when the control information is moved into skb->cb

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fb55f4d1

drivers/net/wireless/rt2x00/rt2400pci.c

+2 −4
Original line number Diff line number Diff line
@@ -1001,8 +1001,7 @@ static int rt2400pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
 */

static void rt2400pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,

				    struct sk_buff *skb,

				    struct txentry_desc *txdesc,

				    struct ieee80211_tx_control *control)

				    struct txentry_desc *txdesc)

{

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);

	__le32 *txd = skbdesc->desc;
@@ -1046,8 +1045,7 @@ static void rt2400pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
			   test_bit(ENTRY_TXD_RTS_FRAME, &txdesc->flags));

	rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->ifs);

	rt2x00_set_field32(&word, TXD_W0_RETRY_MODE,

			   !!(control->flags &

			      IEEE80211_TXCTL_LONG_RETRY_LIMIT));

+			   test_bit(ENTRY_TXD_RETRY_MODE, &txdesc->flags));

	rt2x00_desc_write(txd, 0, word);

}

drivers/net/wireless/rt2x00/rt2500pci.c

+2 −5
Original line number Diff line number Diff line
@@ -1155,8 +1155,7 @@ static int rt2500pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
 */

static void rt2500pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,

				    struct sk_buff *skb,

				    struct txentry_desc *txdesc,

				    struct ieee80211_tx_control *control)

				    struct txentry_desc *txdesc)

{

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);

	__le32 *txd = skbdesc->desc;
@@ -1198,9 +1197,7 @@ static void rt2500pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	rt2x00_set_field32(&word, TXD_W0_CIPHER_OWNER, 1);

	rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->ifs);

	rt2x00_set_field32(&word, TXD_W0_RETRY_MODE,

			   !!(control->flags &

			      IEEE80211_TXCTL_LONG_RETRY_LIMIT));

	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, skbdesc->data_len);

			   test_bit(ENTRY_TXD_RETRY_MODE, &txdesc->flags));

	rt2x00_set_field32(&word, TXD_W0_CIPHER_ALG, CIPHER_NONE);

	rt2x00_desc_write(txd, 0, word);

}

drivers/net/wireless/rt2x00/rt2500usb.c

+3 −4
Original line number Diff line number Diff line
@@ -1033,8 +1033,7 @@ static int rt2500usb_set_device_state(struct rt2x00_dev *rt2x00dev, 
 */

static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,

				    struct sk_buff *skb,

				    struct txentry_desc *txdesc,

				    struct ieee80211_tx_control *control)

				    struct txentry_desc *txdesc)

{

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);

	__le32 *txd = skbdesc->desc;
@@ -1058,7 +1057,7 @@ static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	rt2x00_desc_write(txd, 2, word);



	rt2x00_desc_read(txd, 0, &word);

	rt2x00_set_field32(&word, TXD_W0_RETRY_LIMIT, control->retry_limit);

	rt2x00_set_field32(&word, TXD_W0_RETRY_LIMIT, txdesc->retry_limit);

	rt2x00_set_field32(&word, TXD_W0_MORE_FRAG,

			   test_bit(ENTRY_TXD_MORE_FRAG, &txdesc->flags));

	rt2x00_set_field32(&word, TXD_W0_ACK,
@@ -1068,7 +1067,7 @@ static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	rt2x00_set_field32(&word, TXD_W0_OFDM,

			   test_bit(ENTRY_TXD_OFDM_RATE, &txdesc->flags));

	rt2x00_set_field32(&word, TXD_W0_NEW_SEQ,

			   !!(control->flags & IEEE80211_TXCTL_FIRST_FRAGMENT));

			   test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags));

	rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->ifs);

	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, skbdesc->data_len);

	rt2x00_set_field32(&word, TXD_W0_CIPHER, CIPHER_NONE);

drivers/net/wireless/rt2x00/rt2x00.h

+1 −2
Original line number Diff line number Diff line
@@ -540,8 +540,7 @@ struct rt2x00lib_ops { 
	 */

	void (*write_tx_desc) (struct rt2x00_dev *rt2x00dev,

			       struct sk_buff *skb,

			       struct txentry_desc *txdesc,

			       struct ieee80211_tx_control *control);

			       struct txentry_desc *txdesc);

	int (*write_tx_data) (struct rt2x00_dev *rt2x00dev,

			      struct data_queue *queue, struct sk_buff *skb,

			      struct ieee80211_tx_control *control);

drivers/net/wireless/rt2x00/rt2x00dev.c

+14 −5
Original line number Diff line number Diff line
@@ -664,7 +664,12 @@ void rt2x00lib_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
			tx_rate = control->rts_cts_rate->hw_value;

	}



	rate = rt2x00_get_rate(tx_rate);

	/*

	 * Determine retry information.

	 */

	txdesc.retry_limit = control->retry_limit;

	if (control->flags & IEEE80211_TXCTL_LONG_RETRY_LIMIT)

		__set_bit(ENTRY_TXD_RETRY_MODE, &txdesc.flags);



	/*

	 * Check if more fragments are pending
@@ -686,16 +691,20 @@ void rt2x00lib_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	 * Set ifs to IFS_SIFS when the this is not the first fragment,

	 * or this fragment came after RTS/CTS.

	 */

	if ((seq_ctrl & IEEE80211_SCTL_FRAG) > 0 ||

	    test_bit(ENTRY_TXD_RTS_FRAME, &txdesc.flags))

	if (test_bit(ENTRY_TXD_RTS_FRAME, &txdesc.flags)) {

		txdesc.ifs = IFS_SIFS;

	else

	} else if (control->flags & IEEE80211_TXCTL_FIRST_FRAGMENT) {

		__set_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc.flags);

		txdesc.ifs = IFS_BACKOFF;

	} else {

		txdesc.ifs = IFS_SIFS;

	}



	/*

	 * PLCP setup

	 * Length calculation depends on OFDM/CCK rate.

	 */

	rate = rt2x00_get_rate(tx_rate);

	txdesc.signal = rate->plcp;

	txdesc.service = 0x04;
@@ -733,7 +742,7 @@ void rt2x00lib_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
			txdesc.signal |= 0x08;

	}



	rt2x00dev->ops->lib->write_tx_desc(rt2x00dev, skb, &txdesc, control);

	rt2x00dev->ops->lib->write_tx_desc(rt2x00dev, skb, &txdesc);



	/*

	 * Update queue entry.