1 files changed, 26 insertions, 9 deletions
diff --git a/drivers/net/wireless/ath/ath5k/desc.h b/drivers/net/wireless/ath/ath5k/desc.h
index 56158c804e3e..64538fbe4167 100644
--- a/drivers/net/wireless/ath/ath5k/desc.h
+++ b/drivers/net/wireless/ath/ath5k/desc.h
@@ -112,15 +112,32 @@ struct ath5k_hw_rx_error {
 #define AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE      0x0000ff00
 #define AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE_S    8
-/* PHY Error codes */
+/**
-#define AR5K_DESC_RX_PHY_ERROR_NONE             0x00
+ * enum ath5k_phy_error_code - PHY Error codes
-#define AR5K_DESC_RX_PHY_ERROR_TIMING           0x20
+ */
-#define AR5K_DESC_RX_PHY_ERROR_PARITY           0x40
+enum ath5k_phy_error_code {
-#define AR5K_DESC_RX_PHY_ERROR_RATE             0x60
+        AR5K_RX_PHY_ERROR_UNDERRUN              = 0,    /* Transmit underrun */
-#define AR5K_DESC_RX_PHY_ERROR_LENGTH           0x80
+        AR5K_RX_PHY_ERROR_TIMING                = 1,    /* Timing error */
-#define AR5K_DESC_RX_PHY_ERROR_64QAM            0xa0
+        AR5K_RX_PHY_ERROR_PARITY                = 2,    /* Illegal parity */
-#define AR5K_DESC_RX_PHY_ERROR_SERVICE          0xc0
+        AR5K_RX_PHY_ERROR_RATE                  = 3,    /* Illegal rate */
-#define AR5K_DESC_RX_PHY_ERROR_TRANSMITOVR      0xe0
+        AR5K_RX_PHY_ERROR_LENGTH                = 4,    /* Illegal length */
+        AR5K_RX_PHY_ERROR_RADAR                 = 5,    /* Radar detect */
+        AR5K_RX_PHY_ERROR_SERVICE               = 6,    /* Illegal service */
+        AR5K_RX_PHY_ERROR_TOR                   = 7,    /* Transmit override receive */
+        /* these are specific to the 5212 */
+        AR5K_RX_PHY_ERROR_OFDM_TIMING           = 17,
+        AR5K_RX_PHY_ERROR_OFDM_SIGNAL_PARITY    = 18,
+        AR5K_RX_PHY_ERROR_OFDM_RATE_ILLEGAL     = 19,
+        AR5K_RX_PHY_ERROR_OFDM_LENGTH_ILLEGAL   = 20,
+        AR5K_RX_PHY_ERROR_OFDM_POWER_DROP       = 21,
+        AR5K_RX_PHY_ERROR_OFDM_SERVICE          = 22,
+        AR5K_RX_PHY_ERROR_OFDM_RESTART          = 23,
+        AR5K_RX_PHY_ERROR_CCK_TIMING            = 25,
+        AR5K_RX_PHY_ERROR_CCK_HEADER_CRC        = 26,
+        AR5K_RX_PHY_ERROR_CCK_RATE_ILLEGAL      = 27,
+        AR5K_RX_PHY_ERROR_CCK_SERVICE           = 30,
+        AR5K_RX_PHY_ERROR_CCK_RESTART           = 31,
+};
 /*
 * 5210/5211 hardware 2-word TX control descriptor

diff --git a/drivers/net/wireless/ath/ath5k/desc.h b/drivers/net/wireless/ath/ath5k/desc.h index 56158c804e3e..64538fbe4167 100644 --- a/drivers/net/wireless/ath/ath5k/desc.h +++ b/drivers/net/wireless/ath/ath5k/desc.h
@@ -112,15 +112,32 @@ struct ath5k_hw_rx_error {
112	#define AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE 0x0000ff00	112	#define AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE 0x0000ff00
113	#define AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE_S 8	113	#define AR5K_RX_DESC_ERROR1_PHY_ERROR_CODE_S 8
114		114
115	/* PHY Error codes */	115	/**
116	#define AR5K_DESC_RX_PHY_ERROR_NONE 0x00	116	* enum ath5k_phy_error_code - PHY Error codes
117	#define AR5K_DESC_RX_PHY_ERROR_TIMING 0x20	117	*/
118	#define AR5K_DESC_RX_PHY_ERROR_PARITY 0x40	118	enum ath5k_phy_error_code {
119	#define AR5K_DESC_RX_PHY_ERROR_RATE 0x60	119	AR5K_RX_PHY_ERROR_UNDERRUN = 0, /* Transmit underrun */
120	#define AR5K_DESC_RX_PHY_ERROR_LENGTH 0x80	120	AR5K_RX_PHY_ERROR_TIMING = 1, /* Timing error */
121	#define AR5K_DESC_RX_PHY_ERROR_64QAM 0xa0	121	AR5K_RX_PHY_ERROR_PARITY = 2, /* Illegal parity */
122	#define AR5K_DESC_RX_PHY_ERROR_SERVICE 0xc0	122	AR5K_RX_PHY_ERROR_RATE = 3, /* Illegal rate */
123	#define AR5K_DESC_RX_PHY_ERROR_TRANSMITOVR 0xe0	123	AR5K_RX_PHY_ERROR_LENGTH = 4, /* Illegal length */
		124	AR5K_RX_PHY_ERROR_RADAR = 5, /* Radar detect */
		125	AR5K_RX_PHY_ERROR_SERVICE = 6, /* Illegal service */
		126	AR5K_RX_PHY_ERROR_TOR = 7, /* Transmit override receive */
		127	/* these are specific to the 5212 */
		128	AR5K_RX_PHY_ERROR_OFDM_TIMING = 17,
		129	AR5K_RX_PHY_ERROR_OFDM_SIGNAL_PARITY = 18,
		130	AR5K_RX_PHY_ERROR_OFDM_RATE_ILLEGAL = 19,
		131	AR5K_RX_PHY_ERROR_OFDM_LENGTH_ILLEGAL = 20,
		132	AR5K_RX_PHY_ERROR_OFDM_POWER_DROP = 21,
		133	AR5K_RX_PHY_ERROR_OFDM_SERVICE = 22,
		134	AR5K_RX_PHY_ERROR_OFDM_RESTART = 23,
		135	AR5K_RX_PHY_ERROR_CCK_TIMING = 25,
		136	AR5K_RX_PHY_ERROR_CCK_HEADER_CRC = 26,
		137	AR5K_RX_PHY_ERROR_CCK_RATE_ILLEGAL = 27,
		138	AR5K_RX_PHY_ERROR_CCK_SERVICE = 30,
		139	AR5K_RX_PHY_ERROR_CCK_RESTART = 31,
		140	};
124		141
125	/*	142	/*
126	* 5210/5211 hardware 2-word TX control descriptor	143	* 5210/5211 hardware 2-word TX control descriptor