8 files changed, 30 insertions, 15 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index aa6dfb811c71..181a146b4768 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -1220,6 +1220,7 @@ static void rt2500pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
         rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->ifs);
         rt2x00_set_field32(&word, TXD_W0_RETRY_MODE,
                            test_bit(ENTRY_TXD_RETRY_MODE, &txdesc->flags));
+        rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, skb->len);
         rt2x00_set_field32(&word, TXD_W0_CIPHER_ALG, CIPHER_NONE);
         rt2x00_desc_write(txd, 0, word);
 }
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 3078417b326b..c6f6eb6e17a1 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1376,6 +1376,9 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_BBPTUNE_VGCLOWER, bbp);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_VGC, word);
                 EEPROM(rt2x00dev, "BBPtune vgc: 0x%04x\n", word);
+        } else {
+                rt2x00_set_field16(&word, EEPROM_BBPTUNE_VGCLOWER, bbp);
+                rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_VGC, word);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_BBPTUNE_R17, &word);
@@ -1384,9 +1387,6 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field16(&word, EEPROM_BBPTUNE_R17_HIGH, 0x41);
                 rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_R17, word);
                 EEPROM(rt2x00dev, "BBPtune r17: 0x%04x\n", word);
-        } else {
-                rt2x00_set_field16(&word, EEPROM_BBPTUNE_VGCLOWER, bbp);
-                rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_VGC, word);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_BBPTUNE_R24, &word);
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index db2dc976d831..8b10ea41b204 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -368,6 +368,12 @@ struct rt2x00_intf {
 #define DELAYED_CONFIG_ERP              0x00000002
 #define DELAYED_LED_ASSOC               0x00000004
 
+        /*
+         * Software sequence counter, this is only required
+         * for hardware which doesn't support hardware
+         * sequence counting.
+         */
+        spinlock_t seqlock;
         u16 seqno;
 };
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c
index 3f89516e8332..d134c3be539a 100644
--- a/drivers/net/wireless/rt2x00/rt2x00config.c
+++ b/drivers/net/wireless/rt2x00/rt2x00config.c
@@ -254,6 +254,8 @@ config:
                         libconf.ant.rx = default_ant->rx;
                 else if (active_ant->rx == ANTENNA_SW_DIVERSITY)
                         libconf.ant.rx = ANTENNA_B;
+                else
+                        libconf.ant.rx = active_ant->rx;
 
                 if (conf->antenna_sel_tx)
                         libconf.ant.tx = conf->antenna_sel_tx;
@@ -261,6 +263,8 @@ config:
                         libconf.ant.tx = default_ant->tx;
                 else if (active_ant->tx == ANTENNA_SW_DIVERSITY)
                         libconf.ant.tx = ANTENNA_B;
+                else
+                        libconf.ant.tx = active_ant->tx;
         }
 
         if (flags & CONFIG_UPDATE_SLOT_TIME) {
diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c
index 300cf061035f..6bee1d611bbf 100644
--- a/drivers/net/wireless/rt2x00/rt2x00debug.c
+++ b/drivers/net/wireless/rt2x00/rt2x00debug.c
@@ -372,9 +372,6 @@ static ssize_t rt2x00debug_write_##__name(struct file *file,	\
         if (*offset)                                            \
                 return 0;                                       \
                                                                 \
-        if (!capable(CAP_NET_ADMIN))                            \
-                return -EPERM;                                  \
-                                                                \
         if (intf->offset_##__name >= debug->__name.word_count)  \
                 return -EINVAL;                                 \
                                                                 \
@@ -454,7 +451,7 @@ static struct dentry *rt2x00debug_create_file_driver(const char *name,
         data += sprintf(data, "compiled: %s %s\n", __DATE__, __TIME__);
         blob->size = strlen(blob->data);
 
-        return debugfs_create_blob(name, S_IRUGO, intf->driver_folder, blob);
+        return debugfs_create_blob(name, S_IRUSR, intf->driver_folder, blob);
 }
 
 static struct dentry *rt2x00debug_create_file_chipset(const char *name,
@@ -482,7 +479,7 @@ static struct dentry *rt2x00debug_create_file_chipset(const char *name,
         data += sprintf(data, "rf length: %d\n", debug->rf.word_count);
         blob->size = strlen(blob->data);
 
-        return debugfs_create_blob(name, S_IRUGO, intf->driver_folder, blob);
+        return debugfs_create_blob(name, S_IRUSR, intf->driver_folder, blob);
 }
 
 void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
@@ -517,7 +514,7 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
         if (IS_ERR(intf->chipset_entry))
                 goto exit;
 
-        intf->dev_flags = debugfs_create_file("dev_flags", S_IRUGO,
+        intf->dev_flags = debugfs_create_file("dev_flags", S_IRUSR,
                                               intf->driver_folder, intf,
                                               &rt2x00debug_fop_dev_flags);
         if (IS_ERR(intf->dev_flags))
@@ -532,7 +529,7 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
 ({                                                              \
         (__intf)->__name##_off_entry =                          \
             debugfs_create_u32(__stringify(__name) "_offset",   \
-                               S_IRUGO | S_IWUSR,               \
+                               S_IRUSR | S_IWUSR,               \
                                (__intf)->register_folder,       \
                                &(__intf)->offset_##__name);     \
         if (IS_ERR((__intf)->__name##_off_entry))               \
@@ -540,7 +537,7 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
                                                                 \
         (__intf)->__name##_val_entry =                          \
             debugfs_create_file(__stringify(__name) "_value",   \
-                                S_IRUGO | S_IWUSR,              \
+                                S_IRUSR | S_IWUSR,              \
                                 (__intf)->register_folder,      \
                                 (__intf), &rt2x00debug_fop_##__name);\
         if (IS_ERR((__intf)->__name##_val_entry))               \
@@ -560,7 +557,7 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
                 goto exit;
 
         intf->queue_frame_dump_entry =
-            debugfs_create_file("dump", S_IRUGO, intf->queue_folder,
+            debugfs_create_file("dump", S_IRUSR, intf->queue_folder,
                                 intf, &rt2x00debug_fop_queue_dump);
         if (IS_ERR(intf->queue_frame_dump_entry))
                 goto exit;
@@ -569,7 +566,7 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
         init_waitqueue_head(&intf->frame_dump_waitqueue);
 
         intf->queue_stats_entry =
-            debugfs_create_file("queue", S_IRUGO, intf->queue_folder,
+            debugfs_create_file("queue", S_IRUSR, intf->queue_folder,
                                 intf, &rt2x00debug_fop_queue_stats);
 
         return;
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index c3ee4ecba792..bd422fd6a894 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -247,6 +247,7 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,
                 rt2x00dev->intf_sta_count++;
 
         spin_lock_init(&intf->lock);
+        spin_lock_init(&intf->seqlock);
         intf->beacon = entry;
 
         if (conf->type == IEEE80211_IF_TYPE_AP)
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 3b27f6aa860c..898cdd7f57d9 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -128,6 +128,7 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry,
         unsigned int data_length;
         unsigned int duration;
         unsigned int residual;
+        unsigned long irqflags;
 
         memset(txdesc, 0, sizeof(*txdesc));
 
@@ -213,14 +214,14 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry,
          * sequence counter given by mac80211.
          */
         if (tx_info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {
-                spin_lock(&intf->lock);
+                spin_lock_irqsave(&intf->seqlock, irqflags);
 
                 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
                         intf->seqno += 0x10;
                 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
                 hdr->seq_ctrl |= cpu_to_le16(intf->seqno);
 
-                spin_unlock(&intf->lock);
+                spin_unlock_irqrestore(&intf->seqlock, irqflags);
 
                 __set_bit(ENTRY_TXD_GENERATE_SEQ, &txdesc->flags);
         }
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index fbe2a652e014..087e90b328cd 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -1004,6 +1004,11 @@ static int rt61pci_load_firmware(struct rt2x00_dev *rt2x00dev, const void *data,
         }
 
         /*
+         * Hardware needs another millisecond before it is ready.
+         */
+        msleep(1);
+
+        /*
          * Reset MAC and BBP registers.
          */
         reg = 0;