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

Commit 92f5ac63 authored by Mattias Nissler's avatar Mattias Nissler Committed by John W. Linville
Browse files

rt2x00: Initialize TX control field in data entries 



In the TX path, the driver didn't copy the TX control data structure. Thus, it
was invalid in the TX done handler, causing serious trouble and misbehaviour.

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 f855c10b

drivers/net/wireless/rt2x00/rt2x00pci.c

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ int rt2x00pci_write_tx_data(struct rt2x00_dev *rt2x00dev, 
	skbdesc->desc_len = queue->desc_size;

	skbdesc->entry = entry;



	memcpy(&priv_tx->control, control, sizeof(priv_tx->control));

	memcpy(priv_tx->data, skb->data, skb->len);

	rt2x00lib_write_tx_desc(rt2x00dev, skb, control);

drivers/net/wireless/rt2x00/rt2x00usb.c

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev, 
	skbdesc->desc_len = queue->desc_size;

	skbdesc->entry = entry;



	memcpy(&priv_tx->control, control, sizeof(priv_tx->control));

	rt2x00lib_write_tx_desc(rt2x00dev, skb, control);



	/*