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

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

rt2x00: wireless CLI ID and packet ID must not be 0 



In the TX descriptor the Packet ID must not be 0,
so add 1 to the ID. The wireless CLI ID is not allowed
to be 0 either, but also must be initialized with the
wcid value rather then keyid.

Based on a patch for rt2800pci from Benoit

Signed-off-by: default avatarBenoit PAPILLAULT <benoit.papillault@free.fr>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0fefe0fd

drivers/net/wireless/rt2x00/rt2800usb.c

+2 −2
Original line number Diff line number Diff line
@@ -1995,11 +1995,11 @@ static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	rt2x00_set_field32(&word, TXWI_W1_BW_WIN_SIZE, txdesc->ba_size);

	rt2x00_set_field32(&word, TXWI_W1_WIRELESS_CLI_ID,

			   test_bit(ENTRY_TXD_ENCRYPT, &txdesc->flags) ?

			       txdesc->key_idx : 0xff);

			       (skbdesc->entry->entry_idx + 1) : 0xff);

	rt2x00_set_field32(&word, TXWI_W1_MPDU_TOTAL_BYTE_COUNT,

			   skb->len - txdesc->l2pad);

	rt2x00_set_field32(&word, TXWI_W1_PACKETID,

			   skbdesc->entry->entry_idx);

			   skbdesc->entry->queue->qid + 1);

	rt2x00_desc_write(txwi, 1, word);



	/*