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

Commit ead2bb64 authored by Helmut Schaa's avatar Helmut Schaa Committed by John W. Linville
Browse files

rt2x00: Add WCID to HT TX descriptor 



When sending an unencrypted frame to a STA the driver might want to pass
a suitable WCID since we don't have a key index to allow tx status
reports to get properly assigned to the correct STA.

Signed-off-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f03fcfc1

drivers/net/wireless/rt2x00/rt2x00queue.c

+6 −1
Original line number Diff line number Diff line
@@ -310,11 +310,16 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, 
	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);

	struct ieee80211_tx_rate *txrate = &tx_info->control.rates[0];

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

	struct rt2x00_sta *sta_priv = NULL;



	if (tx_info->control.sta)

	if (tx_info->control.sta) {

		txdesc->u.ht.mpdu_density =

		    tx_info->control.sta->ht_cap.ampdu_density;



		sta_priv = sta_to_rt2x00_sta(tx_info->control.sta);

		txdesc->u.ht.wcid = sta_priv->wcid;

	}



	txdesc->u.ht.ba_size = 7;	/* FIXME: What value is needed? */



	/*

drivers/net/wireless/rt2x00/rt2x00queue.h

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ struct txentry_desc { 
			u8 ba_size;

			u8 mpdu_density;

			enum txop txop;

			int wcid;

		} ht;

	} u;