[rt2x00-users] [PATCH 12/12] rt2x00: Use MCS defines for rt2800usb

[Benoit PAPILLAULT]

Signed-off-by: Benoit PAPILLAULT <benoit.papillault at free.fr>
---
 drivers/net/wireless/rt2x00/rt2800usb.c |   56 +++++++++++++++---------------
 1 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index c24bbd8..77c3354 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -1496,43 +1496,43 @@ static int rt2800usb_init_registers(struct rt2x00_dev *rt2x00dev)
 	rt2x00usb_register_write(rt2x00dev, USB_CYC_CFG, reg);
 
 	rt2x00usb_register_read(rt2x00dev, HT_FBK_CFG0, &reg);
-	rt2x00_set_field32(&reg, HT_FBK_CFG0_HTMCS0FBK, 0);
-	rt2x00_set_field32(&reg, HT_FBK_CFG0_HTMCS1FBK, 0);
-	rt2x00_set_field32(&reg, HT_FBK_CFG0_HTMCS2FBK, 1);
-	rt2x00_set_field32(&reg, HT_FBK_CFG0_HTMCS3FBK, 2);
-	rt2x00_set_field32(&reg, HT_FBK_CFG0_HTMCS4FBK, 3);
-	rt2x00_set_field32(&reg, HT_FBK_CFG0_HTMCS5FBK, 4);
-	rt2x00_set_field32(&reg, HT_FBK_CFG0_HTMCS6FBK, 5);
-	rt2x00_set_field32(&reg, HT_FBK_CFG0_HTMCS7FBK, 6);
+	rt2x00_set_field32(&reg, HT_FBK_CFG0_HTMCS0FBK, MCS_0);
+	rt2x00_set_field32(&reg, HT_FBK_CFG0_HTMCS1FBK, MCS_0);
+	rt2x00_set_field32(&reg, HT_FBK_CFG0_HTMCS2FBK, MCS_1);
+	rt2x00_set_field32(&reg, HT_FBK_CFG0_HTMCS3FBK, MCS_2);
+	rt2x00_set_field32(&reg, HT_FBK_CFG0_HTMCS4FBK, MCS_3);
+	rt2x00_set_field32(&reg, HT_FBK_CFG0_HTMCS5FBK, MCS_4);
+	rt2x00_set_field32(&reg, HT_FBK_CFG0_HTMCS6FBK, MCS_5);
+	rt2x00_set_field32(&reg, HT_FBK_CFG0_HTMCS7FBK, MCS_6);
 	rt2x00usb_register_write(rt2x00dev, HT_FBK_CFG0, reg);
 
 	rt2x00usb_register_read(rt2x00dev, HT_FBK_CFG1, &reg);
-	rt2x00_set_field32(&reg, HT_FBK_CFG1_HTMCS8FBK, 8);
-	rt2x00_set_field32(&reg, HT_FBK_CFG1_HTMCS9FBK, 8);
-	rt2x00_set_field32(&reg, HT_FBK_CFG1_HTMCS10FBK, 9);
-	rt2x00_set_field32(&reg, HT_FBK_CFG1_HTMCS11FBK, 10);
-	rt2x00_set_field32(&reg, HT_FBK_CFG1_HTMCS12FBK, 11);
-	rt2x00_set_field32(&reg, HT_FBK_CFG1_HTMCS13FBK, 12);
-	rt2x00_set_field32(&reg, HT_FBK_CFG1_HTMCS14FBK, 13);
-	rt2x00_set_field32(&reg, HT_FBK_CFG1_HTMCS15FBK, 14);
+	rt2x00_set_field32(&reg, HT_FBK_CFG1_HTMCS8FBK, MCS_8);
+	rt2x00_set_field32(&reg, HT_FBK_CFG1_HTMCS9FBK, MCS_8);
+	rt2x00_set_field32(&reg, HT_FBK_CFG1_HTMCS10FBK, MCS_9);
+	rt2x00_set_field32(&reg, HT_FBK_CFG1_HTMCS11FBK, MCS_10);
+	rt2x00_set_field32(&reg, HT_FBK_CFG1_HTMCS12FBK, MCS_11);
+	rt2x00_set_field32(&reg, HT_FBK_CFG1_HTMCS13FBK, MCS_12);
+	rt2x00_set_field32(&reg, HT_FBK_CFG1_HTMCS14FBK, MCS_13);
+	rt2x00_set_field32(&reg, HT_FBK_CFG1_HTMCS15FBK, MCS_14);
 	rt2x00usb_register_write(rt2x00dev, HT_FBK_CFG1, reg);
 
 	rt2x00usb_register_read(rt2x00dev, LG_FBK_CFG0, &reg);
-	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS0FBK, 8);
-	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS1FBK, 8);
-	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS2FBK, 9);
-	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS3FBK, 10);
-	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS4FBK, 11);
-	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS5FBK, 12);
-	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS6FBK, 13);
-	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS7FBK, 14);
+	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS0FBK, MCS_RATE_6 | MCS_OFDM_FLAG);
+	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS1FBK, MCS_RATE_6 | MCS_OFDM_FLAG);
+	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS2FBK, MCS_RATE_9 | MCS_OFDM_FLAG);
+	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS3FBK, MCS_RATE_12 | MCS_OFDM_FLAG);
+	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS4FBK, MCS_RATE_18 | MCS_OFDM_FLAG);
+	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS5FBK, MCS_RATE_24 | MCS_OFDM_FLAG);
+	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS6FBK, MCS_RATE_36 | MCS_OFDM_FLAG);
+	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS7FBK, MCS_RATE_48 | MCS_OFDM_FLAG);
 	rt2x00usb_register_write(rt2x00dev, LG_FBK_CFG0, reg);
 
 	rt2x00usb_register_read(rt2x00dev, LG_FBK_CFG1, &reg);
-	rt2x00_set_field32(&reg, LG_FBK_CFG0_CCKMCS0FBK, 0);
-	rt2x00_set_field32(&reg, LG_FBK_CFG0_CCKMCS1FBK, 0);
-	rt2x00_set_field32(&reg, LG_FBK_CFG0_CCKMCS2FBK, 1);
-	rt2x00_set_field32(&reg, LG_FBK_CFG0_CCKMCS3FBK, 2);
+	rt2x00_set_field32(&reg, LG_FBK_CFG0_CCKMCS0FBK, MCS_RATE_1);
+	rt2x00_set_field32(&reg, LG_FBK_CFG0_CCKMCS1FBK, MCS_RATE_1);
+	rt2x00_set_field32(&reg, LG_FBK_CFG0_CCKMCS2FBK, MCS_RATE_2);
+	rt2x00_set_field32(&reg, LG_FBK_CFG0_CCKMCS3FBK, MCS_RATE_5_5);
 	rt2x00usb_register_write(rt2x00dev, LG_FBK_CFG1, reg);
 
 	/*
-- 
1.6.2.4