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

Commit 1abc3656 authored by Mattias Nissler's avatar Mattias Nissler Committed by John W. Linville
Browse files

rt2x00: skb->data pointer should not include TX descriptor 



Make sure the skb->data pointer points to the frame data, not the TX
descriptor. The frame dumping code relies on that.

Signed-off-by: default avatarMattias Nissler <mattias.nissler@gmx.de>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6c6aa3c0

drivers/net/wireless/rt2x00/rt2500usb.c

+1 −2
Original line number Diff line number Diff line
@@ -1114,8 +1114,7 @@ static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	rt2x00_set_field32(&word, TXD_W0_NEW_SEQ,

			   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,

			   skb->len - skbdesc->desc_len);

	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, skb->len);

	rt2x00_set_field32(&word, TXD_W0_CIPHER, CIPHER_NONE);

	rt2x00_desc_write(txd, 0, word);

}

drivers/net/wireless/rt2x00/rt2x00usb.c

+6 −5
Original line number Diff line number Diff line
@@ -167,11 +167,6 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb) 
	    !test_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags))

		return;



	/*

	 * Remove the descriptor data from the buffer.

	 */

	skb_pull(entry->skb, entry->queue->desc_size);



	/*

	 * Obtain the status about this packet.

	 * Note that when the status is 0 it does not mean the
@@ -224,6 +219,12 @@ int rt2x00usb_write_tx_data(struct queue_entry *entry) 
			  entry->skb->data, length,

			  rt2x00usb_interrupt_txdone, entry);



	/*

	 * Make sure the skb->data pointer points to the frame, not the

	 * descriptor.

	 */

	skb_pull(entry->skb, entry->queue->desc_size);



	return 0;

}

EXPORT_SYMBOL_GPL(rt2x00usb_write_tx_data);

drivers/net/wireless/rt2x00/rt73usb.c

+1 −2
Original line number Diff line number Diff line
@@ -1556,8 +1556,7 @@ static void rt73usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	rt2x00_set_field32(&word, TXD_W0_KEY_TABLE,

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

	rt2x00_set_field32(&word, TXD_W0_KEY_INDEX, txdesc->key_idx);

	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT,

			   skb->len - skbdesc->desc_len);

	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, skb->len);

	rt2x00_set_field32(&word, TXD_W0_BURST2,

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

	rt2x00_set_field32(&word, TXD_W0_CIPHER_ALG, txdesc->cipher);