Home Explore Help
Register Sign In
ldpinney
/
GnuBee-libreCMC
forked from libreCMC/libreCMC
2
0
Fork 2
Files
Tree: 92a7239b36
Branches Tags
GnuBee-libreCMC
/
package
/
kernel
/
mac80211
/
patches
/
020-13-rt2x00-fixup-fill_tx_status-for-nomatch-case.patch

020-13-rt2x00-fixup-fill_tx_status-for-nomatch-case.patch 2.1 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354 
  1. From ec80ad70d778af7665992672896633ebd3b02ac8 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Stanislaw Gruszka <sgruszka@redhat.com>
    3. 

  3. Date: Wed, 15 Feb 2017 10:25:09 +0100
    4. 

  4. Subject: [PATCH 13/19] rt2x00: fixup fill_tx_status for nomatch case
    5. 

  5. 

  6. Add bits rt2x00lib_fill_tx_status() when filling status in nomatch
    7. 

  7. case and hopefully do not break the function for existing cases.
    8. 

  8. 

  9. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
    10. 

  10. Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    11. 

  11. ---
    12. 

  12.  drivers/net/wireless/ralink/rt2x00/rt2x00dev.c   | 6 +++++-
    13. 

  13.  drivers/net/wireless/ralink/rt2x00/rt2x00queue.h | 1 +
    14. 

  14.  2 files changed, 6 insertions(+), 1 deletion(-)
    15. 

  15. 

  16. diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
    17. 

  17. index 90fc259fb5bc..e95d2aad3b3f 100644
    18. 

  18. --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
    19. 

  19. +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
    20. 

  20. @@ -357,6 +357,9 @@ static void rt2x00lib_fill_tx_status(struct rt2x00_dev *rt2x00dev,
    21. 

  21.  	if (i < (IEEE80211_TX_MAX_RATES - 1))
    22. 

  22.  		tx_info->status.rates[i].idx = -1; /* terminate */
    23. 

  23.  
    24. 

  24. +	if (test_bit(TXDONE_NO_ACK_REQ, &txdesc->flags))
    25. 

  25. +		tx_info->flags |= IEEE80211_TX_CTL_NO_ACK;
    26. 

  26. +
    27. 

  27.  	if (!(tx_info->flags & IEEE80211_TX_CTL_NO_ACK)) {
    28. 

  28.  		if (success)
    29. 

  29.  			tx_info->flags |= IEEE80211_TX_STAT_ACK;
    30. 

  30. @@ -375,7 +378,8 @@ static void rt2x00lib_fill_tx_status(struct rt2x00_dev *rt2x00dev,
    31. 

  31.  	 */
    32. 

  32.  	if (test_bit(TXDONE_AMPDU, &txdesc->flags) ||
    33. 

  33.  	    tx_info->flags & IEEE80211_TX_CTL_AMPDU) {
    34. 

  34. -		tx_info->flags |= IEEE80211_TX_STAT_AMPDU;
    35. 

  35. +		tx_info->flags |= IEEE80211_TX_STAT_AMPDU |
    36. 

  36. +				  IEEE80211_TX_CTL_AMPDU;
    37. 

  37.  		tx_info->status.ampdu_len = 1;
    38. 

  38.  		tx_info->status.ampdu_ack_len = success ? 1 : 0;
    39. 

  39.  
    40. 

  40. diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
    41. 

  41. index 9b297fce4692..c78fb8c8838a 100644
    42. 

  42. --- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
    43. 

  43. +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
    44. 

  44. @@ -215,6 +215,7 @@ enum txdone_entry_desc_flags {
    45. 

  45.  	TXDONE_FAILURE,
    46. 

  46.  	TXDONE_EXCESSIVE_RETRY,
    47. 

  47.  	TXDONE_AMPDU,
    48. 

  48. +	TXDONE_NO_ACK_REQ,
    49. 

  49.  };
    50. 

  50.  
    51. 

  51.  /**
    52. 

  52. -- 
    53. 

  53. 2.12.1
    54. 

  54.