Home Explore Help
Register Sign In
wareck
/
openwrt_chaos_calmer
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: c3df3ea581
Branches Tags
openwrt_chaos_c...
/
package
/
kernel
/
mac80211
/
patches
/
341-mac80211-parse-VHT-info-in-injected-frames.patch

341-mac80211-parse-VHT-info-in-injected-frames.patch 2.0 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465 
  1. From: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
    2. 

  2. Date: Tue, 23 Feb 2016 15:43:35 +0100
    3. 

  3. Subject: [PATCH] mac80211: parse VHT info in injected frames
    4. 

  4. 

  5. Add VHT radiotap parsing support to ieee80211_parse_tx_radiotap().
    6. 

  6. That capability has been tested using a d-link dir-860l rev b1 running
    7. 

  7. OpenWrt trunk and mt76 driver
    8. 

  8. 

  9. Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
    10. 

  10. ---
    11. 

  11. 

  12. --- a/net/mac80211/tx.c
    13. 

  13. +++ b/net/mac80211/tx.c
    14. 

  14. @@ -1690,6 +1690,8 @@ static bool ieee80211_parse_tx_radiotap(
    15. 

  15.  	u8 rate_retries = 0;
    16. 

  16.  	u16 rate_flags = 0;
    17. 

  17.  	u8 mcs_known, mcs_flags, mcs_bw;
    18. 

  18. +	u16 vht_known;
    19. 

  19. +	u8 vht_mcs = 0, vht_nss = 0;
    20. 

  20.  	int i;
    21. 

  21.  
    22. 

  22.  	info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT |
    23. 

  23. @@ -1771,6 +1773,32 @@ static bool ieee80211_parse_tx_radiotap(
    24. 

  24.  				rate_flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
    25. 

  25.  			break;
    26. 

  26.  
    27. 

  27. +		case IEEE80211_RADIOTAP_VHT:
    28. 

  28. +			vht_known = get_unaligned_le16(iterator.this_arg);
    29. 

  29. +			rate_found = true;
    30. 

  30. +
    31. 

  31. +			rate_flags = IEEE80211_TX_RC_VHT_MCS;
    32. 

  32. +			if ((vht_known & IEEE80211_RADIOTAP_VHT_KNOWN_GI) &&
    33. 

  33. +			    (iterator.this_arg[2] &
    34. 

  34. +			     IEEE80211_RADIOTAP_VHT_FLAG_SGI))
    35. 

  35. +				rate_flags |= IEEE80211_TX_RC_SHORT_GI;
    36. 

  36. +			if (vht_known &
    37. 

  37. +			    IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH) {
    38. 

  38. +				if (iterator.this_arg[3] == 1)
    39. 

  39. +					rate_flags |=
    40. 

  40. +						IEEE80211_TX_RC_40_MHZ_WIDTH;
    41. 

  41. +				else if (iterator.this_arg[3] == 4)
    42. 

  42. +					rate_flags |=
    43. 

  43. +						IEEE80211_TX_RC_80_MHZ_WIDTH;
    44. 

  44. +				else if (iterator.this_arg[3] == 11)
    45. 

  45. +					rate_flags |=
    46. 

  46. +						IEEE80211_TX_RC_160_MHZ_WIDTH;
    47. 

  47. +			}
    48. 

  48. +
    49. 

  49. +			vht_mcs = iterator.this_arg[4] >> 4;
    50. 

  50. +			vht_nss = iterator.this_arg[4] & 0xF;
    51. 

  51. +			break;
    52. 

  52. +
    53. 

  53.  		/*
    54. 

  54.  		 * Please update the file
    55. 

  55.  		 * Documentation/networking/mac80211-injection.txt
    56. 

  56. @@ -1796,6 +1824,9 @@ static bool ieee80211_parse_tx_radiotap(
    57. 

  57.  
    58. 

  58.  		if (rate_flags & IEEE80211_TX_RC_MCS) {
    59. 

  59.  			info->control.rates[0].idx = rate;
    60. 

  60. +		} else if (rate_flags & IEEE80211_TX_RC_VHT_MCS) {
    61. 

  61. +			ieee80211_rate_set_vht(info->control.rates, vht_mcs,
    62. 

  62. +					       vht_nss);
    63. 

  63.  		} else {
    64. 

  64.  			for (i = 0; i < sband->n_bitrates; i++) {
    65. 

  65.  				if (rate * 5 != sband->bitrates[i].bitrate)
    66.