302-ath9k-fix-phyerror-codes.patch 4.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108
  1. From: Zefir Kurtisi <[email protected]>
  2. Date: Tue, 20 Oct 2015 14:19:26 +0200
  3. Subject: [PATCH] ath9k: fix phyerror codes
  4. Some of the ath9k_phyerr enums were wrong from the
  5. beginning (and even before). Most of the time the
  6. codes were used for counters to be displayed over
  7. debugfs, which made this a non-functional issue.
  8. Some (e.g. ATH9K_PHYERR_FALSE_RADAR_EXT) are used
  9. for radar detection and require the correct code
  10. to work as intended.
  11. This patch includes:
  12. a) fixes
  13. ATH9K_PHYERR_FALSE_RADAR_EXT: 24 => 36
  14. ATH9K_PHYERR_CCK_LENGTH_ILLEGAL: 32 => 28
  15. ATH9K_PHYERR_CCK_POWER_DROP: 33 => 29
  16. ATH9K_PHYERR_HT_CRC_ERROR: 34 => 32
  17. ATH9K_PHYERR_HT_LENGTH_ILLEGAL: 35 => 33
  18. ATH9K_PHYERR_HT_RATE_ILLEGAL: 36 => 34
  19. b) extensions
  20. ATH9K_PHYERR_CCK_BLOCKER = 24
  21. ATH9K_PHYERR_HT_ZLF = 35
  22. ATH9K_PHYERR_GREEN_FIELD = 37
  23. Aside from the correction and completion made in
  24. the enum, the patch also extends the display of
  25. the related counters in the debugfs.
  26. Signed-off-by: Zefir Kurtisi <[email protected]>
  27. Signed-off-by: Kalle Valo <[email protected]>
  28. ---
  29. --- a/drivers/net/wireless/ath/ath9k/common-debug.c
  30. +++ b/drivers/net/wireless/ath/ath9k/common-debug.c
  31. @@ -207,6 +207,7 @@ static ssize_t read_file_phy_err(struct
  32. PHY_ERR("RADAR ERR", ATH9K_PHYERR_RADAR);
  33. PHY_ERR("SERVICE ERR", ATH9K_PHYERR_SERVICE);
  34. PHY_ERR("TOR ERR", ATH9K_PHYERR_TOR);
  35. +
  36. PHY_ERR("OFDM-TIMING ERR", ATH9K_PHYERR_OFDM_TIMING);
  37. PHY_ERR("OFDM-SIGNAL-PARITY ERR", ATH9K_PHYERR_OFDM_SIGNAL_PARITY);
  38. PHY_ERR("OFDM-RATE ERR", ATH9K_PHYERR_OFDM_RATE_ILLEGAL);
  39. @@ -214,17 +215,24 @@ static ssize_t read_file_phy_err(struct
  40. PHY_ERR("OFDM-POWER-DROP ERR", ATH9K_PHYERR_OFDM_POWER_DROP);
  41. PHY_ERR("OFDM-SERVICE ERR", ATH9K_PHYERR_OFDM_SERVICE);
  42. PHY_ERR("OFDM-RESTART ERR", ATH9K_PHYERR_OFDM_RESTART);
  43. - PHY_ERR("FALSE-RADAR-EXT ERR", ATH9K_PHYERR_FALSE_RADAR_EXT);
  44. +
  45. + PHY_ERR("CCK-BLOCKER ERR", ATH9K_PHYERR_CCK_BLOCKER);
  46. PHY_ERR("CCK-TIMING ERR", ATH9K_PHYERR_CCK_TIMING);
  47. PHY_ERR("CCK-HEADER-CRC ERR", ATH9K_PHYERR_CCK_HEADER_CRC);
  48. PHY_ERR("CCK-RATE ERR", ATH9K_PHYERR_CCK_RATE_ILLEGAL);
  49. - PHY_ERR("CCK-SERVICE ERR", ATH9K_PHYERR_CCK_SERVICE);
  50. - PHY_ERR("CCK-RESTART ERR", ATH9K_PHYERR_CCK_RESTART);
  51. PHY_ERR("CCK-LENGTH ERR", ATH9K_PHYERR_CCK_LENGTH_ILLEGAL);
  52. PHY_ERR("CCK-POWER-DROP ERR", ATH9K_PHYERR_CCK_POWER_DROP);
  53. + PHY_ERR("CCK-SERVICE ERR", ATH9K_PHYERR_CCK_SERVICE);
  54. + PHY_ERR("CCK-RESTART ERR", ATH9K_PHYERR_CCK_RESTART);
  55. +
  56. PHY_ERR("HT-CRC ERR", ATH9K_PHYERR_HT_CRC_ERROR);
  57. PHY_ERR("HT-LENGTH ERR", ATH9K_PHYERR_HT_LENGTH_ILLEGAL);
  58. PHY_ERR("HT-RATE ERR", ATH9K_PHYERR_HT_RATE_ILLEGAL);
  59. + PHY_ERR("HT-ZLF ERR", ATH9K_PHYERR_HT_ZLF);
  60. +
  61. + PHY_ERR("FALSE-RADAR-EXT ERR", ATH9K_PHYERR_FALSE_RADAR_EXT);
  62. + PHY_ERR("GREEN-FIELD ERR", ATH9K_PHYERR_GREEN_FIELD);
  63. + PHY_ERR("SPECTRAL ERR", ATH9K_PHYERR_SPECTRAL);
  64. if (len > size)
  65. len = size;
  66. --- a/drivers/net/wireless/ath/ath9k/mac.h
  67. +++ b/drivers/net/wireless/ath/ath9k/mac.h
  68. @@ -209,21 +209,25 @@ enum ath9k_phyerr {
  69. ATH9K_PHYERR_OFDM_POWER_DROP = 21,
  70. ATH9K_PHYERR_OFDM_SERVICE = 22,
  71. ATH9K_PHYERR_OFDM_RESTART = 23,
  72. - ATH9K_PHYERR_FALSE_RADAR_EXT = 24,
  73. + ATH9K_PHYERR_CCK_BLOCKER = 24,
  74. ATH9K_PHYERR_CCK_TIMING = 25,
  75. ATH9K_PHYERR_CCK_HEADER_CRC = 26,
  76. ATH9K_PHYERR_CCK_RATE_ILLEGAL = 27,
  77. + ATH9K_PHYERR_CCK_LENGTH_ILLEGAL = 28,
  78. + ATH9K_PHYERR_CCK_POWER_DROP = 29,
  79. ATH9K_PHYERR_CCK_SERVICE = 30,
  80. ATH9K_PHYERR_CCK_RESTART = 31,
  81. - ATH9K_PHYERR_CCK_LENGTH_ILLEGAL = 32,
  82. - ATH9K_PHYERR_CCK_POWER_DROP = 33,
  83. - ATH9K_PHYERR_HT_CRC_ERROR = 34,
  84. - ATH9K_PHYERR_HT_LENGTH_ILLEGAL = 35,
  85. - ATH9K_PHYERR_HT_RATE_ILLEGAL = 36,
  86. + ATH9K_PHYERR_HT_CRC_ERROR = 32,
  87. + ATH9K_PHYERR_HT_LENGTH_ILLEGAL = 33,
  88. + ATH9K_PHYERR_HT_RATE_ILLEGAL = 34,
  89. + ATH9K_PHYERR_HT_ZLF = 35,
  90. +
  91. + ATH9K_PHYERR_FALSE_RADAR_EXT = 36,
  92. + ATH9K_PHYERR_GREEN_FIELD = 37,
  93. + ATH9K_PHYERR_SPECTRAL = 38,
  94. - ATH9K_PHYERR_SPECTRAL = 38,
  95. ATH9K_PHYERR_MAX = 39,
  96. };