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

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

rt2x00: Use skbdesc fields for descriptor initialization 



In rt2x00lib_write_tx_desc() the skb->data and skb->len fields
were incorrectly used. For USB drivers both of those values
contain invalid data (skb->data points to the device descriptor,
skb->len contains the frame _and_ descriptor length).

Instead of using the skbuffer fields we should use the skbdesc
fields which are correctly initialized and contain all the data
that we need.

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

drivers/net/wireless/rt2x00/rt2x00dev.c

+2 −2
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ void rt2x00lib_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
{

	struct txentry_desc txdesc;

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);

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

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

	const struct rt2x00_rate *rate;

	int tx_rate;

	int length;
@@ -710,7 +710,7 @@ void rt2x00lib_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	txdesc.signal = rate->plcp;

	txdesc.service = 0x04;



	length = skb->len + FCS_LEN;

	length = skbdesc->data_len + FCS_LEN;

	if (rate->flags & DEV_RATE_OFDM) {

		__set_bit(ENTRY_TXD_OFDM_RATE, &txdesc.flags);