4 files changed, 20 insertions, 10 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index e66a9429fd48..4386823f49d1 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -1421,9 +1421,12 @@ static int rt2500pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
         if (word == 0xffff) {
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_NUM, 2);
-                rt2x00_set_field16(&word, EEPROM_ANTENNA_TX_DEFAULT, 0);
-                rt2x00_set_field16(&word, EEPROM_ANTENNA_RX_DEFAULT, 0);
-                rt2x00_set_field16(&word, EEPROM_ANTENNA_LED_MODE, 0);
+                rt2x00_set_field16(&word, EEPROM_ANTENNA_TX_DEFAULT,
+                                   ANTENNA_SW_DIVERSITY);
+                rt2x00_set_field16(&word, EEPROM_ANTENNA_RX_DEFAULT,
+                                   ANTENNA_SW_DIVERSITY);
+                rt2x00_set_field16(&word, EEPROM_ANTENNA_LED_MODE,
+                                   LED_MODE_DEFAULT);
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_DYN_TXAGC, 0);
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_HARDWARE_RADIO, 0);
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_RF_TYPE, RF2522);
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 7d3e2828747a..98edd621c13b 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1163,9 +1163,12 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
         if (word == 0xffff) {
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_NUM, 2);
-                rt2x00_set_field16(&word, EEPROM_ANTENNA_TX_DEFAULT, 0);
-                rt2x00_set_field16(&word, EEPROM_ANTENNA_RX_DEFAULT, 0);
-                rt2x00_set_field16(&word, EEPROM_ANTENNA_LED_MODE, 0);
+                rt2x00_set_field16(&word, EEPROM_ANTENNA_TX_DEFAULT,
+                                   ANTENNA_SW_DIVERSITY);
+                rt2x00_set_field16(&word, EEPROM_ANTENNA_RX_DEFAULT,
+                                   ANTENNA_SW_DIVERSITY);
+                rt2x00_set_field16(&word, EEPROM_ANTENNA_LED_MODE,
+                                   LED_MODE_DEFAULT);
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_DYN_TXAGC, 0);
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_HARDWARE_RADIO, 0);
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_RF_TYPE, RF2522);
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index f893825ce6dd..83b95a675f08 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -1920,8 +1920,10 @@ static int rt61pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
         if (word == 0xffff) {
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_NUM, 2);
-                rt2x00_set_field16(&word, EEPROM_ANTENNA_TX_DEFAULT, 2);
-                rt2x00_set_field16(&word, EEPROM_ANTENNA_RX_DEFAULT, 2);
+                rt2x00_set_field16(&word, EEPROM_ANTENNA_TX_DEFAULT,
+                                   ANTENNA_B);
+                rt2x00_set_field16(&word, EEPROM_ANTENNA_RX_DEFAULT,
+                                   ANTENNA_B);
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_FRAME_TYPE, 0);
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_DYN_TXAGC, 0);
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_HARDWARE_RADIO, 0);
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index e4ff106f588e..96d85aaf4250 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1391,8 +1391,10 @@ static int rt73usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
         if (word == 0xffff) {
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_NUM, 2);
-                rt2x00_set_field16(&word, EEPROM_ANTENNA_TX_DEFAULT, 2);
-                rt2x00_set_field16(&word, EEPROM_ANTENNA_RX_DEFAULT, 2);
+                rt2x00_set_field16(&word, EEPROM_ANTENNA_TX_DEFAULT,
+                                   ANTENNA_B);
+                rt2x00_set_field16(&word, EEPROM_ANTENNA_RX_DEFAULT,
+                                   ANTENNA_B);
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_FRAME_TYPE, 0);
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_DYN_TXAGC, 0);
                 rt2x00_set_field16(&word, EEPROM_ANTENNA_HARDWARE_RADIO, 0);