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