rt2x00: rt2800: use correct txop value in tx descriptor
PATCH v2 1/1 rt2x00: rt2800: use correct txop value in tx descriptor
rt2800 devices use a different enumeration to specify what IFS values should be used on frame transmission compared to the other rt2x00 devices. Hence, create a new enum called txop that contains the valid values.
Furthermore use the appropriate txop values as found in the ralink drivers:
- TXOP_BACKOFF for management frames
- TXOP_SIFS for subsequent fragments in a burst
- TXOP_HTTXOP for all data frames
--- drivers/net/wireless/rt2x00/rt2800pci.c | 2 +- drivers/net/wireless/rt2x00/rt2800usb.c | 2 +- drivers/net/wireless/rt2x00/rt2x00ht.c | 17 +++++++++++++++++ drivers/net/wireless/rt2x00/rt2x00queue.h | 2 ++ drivers/net/wireless/rt2x00/rt2x00reg.h | 10 ++++++++++ 5 files changed, 31 insertions(+), 2 deletions(-)
drivers/net/wireless/rt2x00/rt2800pci.c +1 -1
@@ -643,7 +643,7 @@ static int rt2800pci_write_tx_data(struct queue_entry* entry,rt2x00_set_field32 (&word,TXWI_W0_AMPDU ,test_bit (ENTRY_TXD_HT_AMPDU , &txdesc->flags));rt2x00_set_field32 (&word,TXWI_W0_MPDU_DENSITY , txdesc->mpdu_density); -rt2x00_set_field32 (&word,TXWI_W0_TX_OP , txdesc->ifs); +rt2x00_set_field32 (&word,TXWI_W0_TX_OP , txdesc->txop);rt2x00_set_field32 (&word,TXWI_W0_MCS , txdesc->mcs);rt2x00_set_field32 (&word,TXWI_W0_BW ,test_bit (ENTRY_TXD_HT_BW_40 , &txdesc->flags));
drivers/net/wireless/rt2x00/rt2800usb.c +1 -1
@@ -417,7 +417,7 @@ static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,rt2x00_set_field32 (&word,TXWI_W0_AMPDU ,test_bit (ENTRY_TXD_HT_AMPDU , &txdesc->flags));rt2x00_set_field32 (&word,TXWI_W0_MPDU_DENSITY , txdesc->mpdu_density); -rt2x00_set_field32 (&word,TXWI_W0_TX_OP , txdesc->ifs); +rt2x00_set_field32 (&word,TXWI_W0_TX_OP , txdesc->txop);rt2x00_set_field32 (&word,TXWI_W0_MCS , txdesc->mcs);rt2x00_set_field32 (&word,TXWI_W0_BW ,test_bit (ENTRY_TXD_HT_BW_40 , &txdesc->flags));
drivers/net/wireless/rt2x00/rt2x00ht.c +17 -0
@@ -35,6 +35,7 @@ void rt2x00ht_create_tx_descriptor(struct queue_entry *entry, {struct ieee80211_tx_info *tx_info =IEEE80211_SKB_CB (entry->skb);struct ieee80211_tx_rate *txrate = &tx_info->control.rates[0 ]; +struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)entry->skb->data;if (tx_info->control.sta) txdesc->mpdu_density =
@@ -66,4 +67,20 @@ void rt2x00ht_create_tx_descriptor(struct queue_entry *entry,__set_bit (ENTRY_TXD_HT_BW_40 , &txdesc->flags);if (txrate->flags &IEEE80211_TX_RC_SHORT_GI )__set_bit (ENTRY_TXD_HT_SHORT_GI , &txdesc->flags); + +/* +* Determine IFS values +* - Use TXOP_BACKOFF for management frames +* - Use TXOP_SIFS for fragment bursts +* - Use TXOP_HTTXOP for everything else +* +* Note: rt2800 devices won't use CTS protection (if used) +* for frames not transmitted with TXOP_HTTXOP +*/ +if (ieee80211_is_mgmt (hdr->frame_control)) + txdesc->txop =TXOP_BACKOFF ; +else if (!(tx_info->flags &IEEE80211_TX_CTL_FIRST_FRAGMENT )) + txdesc->txop =TXOP_SIFS ; +else + txdesc->txop =TXOP_HTTXOP ; }
drivers/net/wireless/rt2x00/rt2x00queue.h +2 -0
@@ -299,6 +299,7 @@ enum txentry_desc_flags {* @retry_limit: Max number of retries. * @aifs: AIFS value. * @ifs: IFS value. +* @txop: IFS value for 11n capable chips. * @cw_min: cwmin value. * @cw_max: cwmax value. * @cipher: Cipher type used for encryption.
@@ -328,6 +329,7 @@ struct txentry_desc {short retry_limit;short aifs;short ifs; +short txop;short cw_min;short cw_max;
drivers/net/wireless/rt2x00/rt2x00reg.h +10 -0
@@ -101,6 +101,16 @@ enum ifs { };/* +* IFS backoff values for HT devices +*/ +enum txop { +TXOP_HTTXOP =0 , +TXOP_PIFS =1 , +TXOP_SIFS =2 , +TXOP_BACKOFF =3 , +}; + +/* * Cipher types for hardware encryption */ enum cipher {
Signature · 1 line
1.6.4.2
Hi,
Quoted 22 lines
drivers/net/wireless/rt2x00/rt2x00ht.c +1
-0@@ -35,6 +35,7 @@ void rt2x00ht_create_tx_descriptor(struct queue_entry *entry, { struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(entry->skb); struct ieee80211_tx_rate *txrate = &tx_info->control.rates[0]; + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)entry->skb->data; if (tx_info->control.sta)txdesc->mpdu_density =
drivers/net/wireless/rt2x00/rt2x00ht.c +6
-0@@ -66,4 +67,20 @@ void rt2x00ht_create_tx_descriptor(struct queue_entry *entry, __set_bit(ENTRY_TXD_HT_BW_40, &txdesc->flags); if (txrate->flags & IEEE80211_TX_RC_SHORT_GI) __set_bit(ENTRY_TXD_HT_SHORT_GI, &txdesc->flags); + + /* +* Determine IFS values +* - Use TXOP_BACKOFF for management frames +* - Use TXOP_SIFS for fragment bursts +* - Use TXOP_HTTXOP for everything else
drivers/net/wireless/rt2x00/rt2x00ht.c void rt2x00ht_create_tx_descriptor(struct queue_entry *entry, · line 85
Quoted 10 lines
drivers/net/wireless/rt2x00/rt2x00ht.c +10
-0+* +* Note: rt2800 devices won't use CTS protection (if used) +* for frames not transmitted with TXOP_HTTXOP +*/ + if (ieee80211_is_mgmt(hdr->frame_control)) + txdesc->txop = TXOP_BACKOFF; + else if (!(tx_info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)) + txdesc->txop = TXOP_SIFS; + else + txdesc->txop = TXOP_HTTXOP;
I can't check it right now, but I am sure this function contains exactly the same checks
for determining the correct ifs value. It would be easier to move the assignment to txop
to the same if-statements.
Ivo
Am Freitag 07 Mai 2010 schrieb Ivo Van Doorn:
Quoted 33 lines
Hi,
Quoted 30 lines
drivers/net/wireless/rt2x00/rt2x00ht.c +15
-0@@ -35,6 +35,7 @@ void rt2x00ht_create_tx_descriptor(struct queue_entry *entry, {struct ieee80211_tx_info *tx_info =IEEE80211_SKB_CB (entry->skb);struct ieee80211_tx_rate *txrate = &tx_info->control.rates[0 ]; +struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)entry->skb->data;if (tx_info->control.sta) txdesc->mpdu_density =@@ -66,4 +67,20 @@ void rt2x00ht_create_tx_descriptor(struct queue_entry *entry,__set_bit (ENTRY_TXD_HT_BW_40 , &txdesc->flags);if (txrate->flags &IEEE80211_TX_RC_SHORT_GI )__set_bit (ENTRY_TXD_HT_SHORT_GI , &txdesc->flags); + +/* +* Determine IFS values +* - Use TXOP_BACKOFF for management frames +* - Use TXOP_SIFS for fragment bursts +* - Use TXOP_HTTXOP for everything else +* +* Note: rt2800 devices won't use CTS protection (if used) +* for frames not transmitted with TXOP_HTTXOP +*/ +if (ieee80211_is_mgmt (hdr->frame_control)) + txdesc->txop =TXOP_BACKOFF ; +else if (!(tx_info->flags &IEEE80211_TX_CTL_FIRST_FRAGMENT )) + txdesc->txop =TXOP_SIFS ;
Quoted 8 lines
drivers/net/wireless/rt2x00/rt2x00ht.c void rt2x00ht_create_tx_descriptor(struct queue_entry *entry, · line 85
Quoted 2 lines
drivers/net/wireless/rt2x00/rt2x00ht.c +2
-0+else + txdesc->txop =TXOP_HTTXOP ;I can't check it right now, but I am sure this function contains exactly the same checks
for determining the correct ifs value. It would be easier to move the assignment to txop
to the same if-statements.
I guess you mean rt2x00queue_create_tx_descriptor in rt2x00queue.c, right? It's not exactly the same but at least the check for the first fragment are there already. We could also move it there. Why I've decided to put it in rt2x00ht.c is because it only applies to HT devices ;)
If you'd prefer to have it in rt2x00queue I'm glad to resend.
Helmut
Ivo Van Doorn
Acked-byQuoted 43 lines · Helmut Schaa
Am Freitag 07 Mai 2010 schrieb Ivo Van Doorn:
Quoted 33 lines
Hi,
Quoted 30 lines
drivers/net/wireless/rt2x00/rt2x00ht.c +1
-0@@ -35,6 +35,7 @@ void rt2x00ht_create_tx_descriptor(struct queue_entry *entry, { struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(entry->skb); struct ieee80211_tx_rate *txrate = &tx_info->control.rates[0]; + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)entry->skb->data; if (tx_info->control.sta)txdesc->mpdu_density =
drivers/net/wireless/rt2x00/rt2x00ht.c +14
-0@@ -66,4 +67,20 @@ void rt2x00ht_create_tx_descriptor(struct queue_entry *entry, __set_bit(ENTRY_TXD_HT_BW_40, &txdesc->flags); if (txrate->flags & IEEE80211_TX_RC_SHORT_GI) __set_bit(ENTRY_TXD_HT_SHORT_GI, &txdesc->flags); + + /* + * Determine IFS values + * - Use TXOP_BACKOFF for management frames + * - Use TXOP_SIFS for fragment bursts + * - Use TXOP_HTTXOP for everything else + * + * Note: rt2800 devices won't use CTS protection (if used) + * for frames not transmitted with TXOP_HTTXOP + */ + if (ieee80211_is_mgmt(hdr->frame_control)) + txdesc->txop = TXOP_BACKOFF; + else if (!(tx_info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)) + txdesc->txop = TXOP_SIFS;Quoted 8 lines
drivers/net/wireless/rt2x00/rt2x00ht.c void rt2x00ht_create_tx_descriptor(struct queue_entry *entry, · line 85
Quoted 2 lines
drivers/net/wireless/rt2x00/rt2x00ht.c +2
-0+ else + txdesc->txop = TXOP_HTTXOP;I can't check it right now, but I am sure this function contains exactly the same checks
for determining the correct ifs value. It would be easier to move the assignment to txop
to the same if-statements.
Quoted 6 lines
I guess you mean
rt2x00queue_create_tx_descriptorinrt2x00queue.c, right? It's not exactly the same but at least the check for the first fragment are there already. We could also move it there. Why I've decided to put it inrt2x00ht.cis because it only applies to HT devices ;)If you'd prefer to have it in rt2x00queue I'm glad to resend.
Ah true this is HT stuff only. I'll look into the exact code later, and perhaps I'll update it later. But this patch can be merged:
Am Freitag 07 Mai 2010 schrieb Ivo Van Doorn:
Quoted 7 lines
Quoted 5 lines · Helmut Schaa
I guess you mean
rt2x00queue_create_tx_descriptorinrt2x00queue.c, right? It's not exactly the same but at least the check for the first fragment are there already. We could also move it there. Why I've decided to put it inrt2x00ht.cis because it only applies to HT devices ;)
Quoted 6 lines
Quoted 1 line
If you'd prefer to have it in rt2x00queue I'm glad to resend.
Ah true this is HT stuff only. I'll look into the exact code later, and perhaps I'll update it later. But this patch can be merged:
Acked-by Ivo van Doorn <[email protected]>
Ok, thanks for the quick review.
Helmut
Quoted 10 lines · Helmut Schaa
rt2800 devices use a different enumeration to specify what IFS values should be used on frame transmission compared to the other rt2x00 devices. Hence, create a new enum called txop that contains the valid values.
Furthermore use the appropriate txop values as found in the ralink drivers:
-TXOP_BACKOFFfor management frames
-TXOP_SIFSfor subsequent fragments in a burst
-TXOP_HTTXOPfor all data framesSigned-off-by Helmut Schaa <[email protected]>
Thanks for doing the proper patch.
Quoted 108 lines
--- drivers/net/wireless/rt2x00/rt2800pci.c | 2 +- drivers/net/wireless/rt2x00/rt2800usb.c | 2 +- drivers/net/wireless/rt2x00/rt2x00ht.c | 17 +++++++++++++++++ drivers/net/wireless/rt2x00/rt2x00queue.h | 2 ++ drivers/net/wireless/rt2x00/rt2x00reg.h | 10 ++++++++++ 5 files changed, 31 insertions(+), 2 deletions(-)drivers/net/wireless/rt2x00/rt2800pci.c +1
-1@@ -643,7 +643,7 @@ static int rt2800pci_write_tx_data(struct queue_entry* entry,rt2x00_set_field32 (&word,TXWI_W0_AMPDU ,test_bit (ENTRY_TXD_HT_AMPDU , &txdesc->flags));rt2x00_set_field32 (&word,TXWI_W0_MPDU_DENSITY , txdesc->mpdu_density); -rt2x00_set_field32 (&word,TXWI_W0_TX_OP , txdesc->ifs); +rt2x00_set_field32 (&word,TXWI_W0_TX_OP , txdesc->txop);rt2x00_set_field32 (&word,TXWI_W0_MCS , txdesc->mcs);rt2x00_set_field32 (&word,TXWI_W0_BW ,test_bit (ENTRY_TXD_HT_BW_40 , &txdesc->flags));drivers/net/wireless/rt2x00/rt2800usb.c +1
-1@@ -417,7 +417,7 @@ static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,rt2x00_set_field32 (&word,TXWI_W0_AMPDU ,test_bit (ENTRY_TXD_HT_AMPDU , &txdesc->flags));rt2x00_set_field32 (&word,TXWI_W0_MPDU_DENSITY , txdesc->mpdu_density); -rt2x00_set_field32 (&word,TXWI_W0_TX_OP , txdesc->ifs); +rt2x00_set_field32 (&word,TXWI_W0_TX_OP , txdesc->txop);rt2x00_set_field32 (&word,TXWI_W0_MCS , txdesc->mcs);rt2x00_set_field32 (&word,TXWI_W0_BW ,test_bit (ENTRY_TXD_HT_BW_40 , &txdesc->flags));drivers/net/wireless/rt2x00/rt2x00ht.c +17
-0@@ -35,6 +35,7 @@ void rt2x00ht_create_tx_descriptor(struct queue_entry *entry, {struct ieee80211_tx_info *tx_info =IEEE80211_SKB_CB (entry->skb);struct ieee80211_tx_rate *txrate = &tx_info->control.rates[0 ]; +struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)entry->skb->data;if (tx_info->control.sta) txdesc->mpdu_density =@@ -66,4 +67,20 @@ void rt2x00ht_create_tx_descriptor(struct queue_entry *entry,__set_bit (ENTRY_TXD_HT_BW_40 , &txdesc->flags);if (txrate->flags &IEEE80211_TX_RC_SHORT_GI )__set_bit (ENTRY_TXD_HT_SHORT_GI , &txdesc->flags); + +/* +* Determine IFS values +* - Use TXOP_BACKOFF for management frames +* - Use TXOP_SIFS for fragment bursts +* - Use TXOP_HTTXOP for everything else +* +* Note: rt2800 devices won't use CTS protection (if used) +* for frames not transmitted with TXOP_HTTXOP +*/ +if (ieee80211_is_mgmt (hdr->frame_control)) + txdesc->txop =TXOP_BACKOFF ; +else if (!(tx_info->flags &IEEE80211_TX_CTL_FIRST_FRAGMENT )) + txdesc->txop =TXOP_SIFS ; +else + txdesc->txop =TXOP_HTTXOP ; }drivers/net/wireless/rt2x00/rt2x00queue.h +2
-0@@ -299,6 +299,7 @@ enum txentry_desc_flags {* @retry_limit: Max number of retries. * @aifs: AIFS value. * @ifs: IFS value. +* @txop: IFS value for 11n capable chips. * @cw_min: cwmin value. * @cw_max: cwmax value. * @cipher: Cipher type used for encryption. @@ -328,6 +329,7 @@ struct txentry_desc {short retry_limit;short aifs;short ifs; +short txop;short cw_min;short cw_max;drivers/net/wireless/rt2x00/rt2x00reg.h +10
-0@@ -101,6 +101,16 @@ enum ifs { };/* +* IFS backoff values for HT devices +*/ +enum txop { +TXOP_HTTXOP =0 , +TXOP_PIFS =1 , +TXOP_SIFS =2 , +TXOP_BACKOFF =3 , +}; + +/* * Cipher types for hardware encryption */ enum cipher {