1 files changed, 60 insertions, 14 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c
index b0498e7e7aae..78787fcc919e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00debug.c
+++ b/drivers/net/wireless/rt2x00/rt2x00debug.c
@@ -63,7 +63,8 @@ struct rt2x00debug_intf {
          * - driver folder
          *   - driver file
          *   - chipset file
-         *   - device flags file
+         *   - device state flags file
+         *   - device capability flags file
          *   - register folder
          *     - csr offset/value files
          *     - eeprom offset/value files
@@ -78,6 +79,7 @@ struct rt2x00debug_intf {
         struct dentry *driver_entry;
         struct dentry *chipset_entry;
         struct dentry *dev_flags;
+        struct dentry *cap_flags;
         struct dentry *register_folder;
         struct dentry *csr_off_entry;
         struct dentry *csr_val_entry;
@@ -162,11 +164,11 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
         struct timeval timestamp;
         u32 data_len;
 
-        do_gettimeofday(&timestamp);
-
-        if (!test_bit(FRAME_DUMP_FILE_OPEN, &intf->frame_dump_flags))
+        if (likely(!test_bit(FRAME_DUMP_FILE_OPEN, &intf->frame_dump_flags)))
                 return;
 
+        do_gettimeofday(&timestamp);
+
         if (skb_queue_len(&intf->frame_dump_skbqueue) > 20) {
                 DEBUG(rt2x00dev, "txrx dump queue length exceeded.\n");
                 return;
@@ -315,6 +317,7 @@ static const struct file_operations rt2x00debug_fop_queue_dump = {
         .poll           = rt2x00debug_poll_queue_dump,
         .open           = rt2x00debug_open_queue_dump,
         .release        = rt2x00debug_release_queue_dump,
+        .llseek         = default_llseek,
 };
 
 static ssize_t rt2x00debug_read_queue_stats(struct file *file,
@@ -333,23 +336,24 @@ static ssize_t rt2x00debug_read_queue_stats(struct file *file,
         if (*offset)
                 return 0;
 
-        data = kzalloc(lines * MAX_LINE_LENGTH, GFP_KERNEL);
+        data = kcalloc(lines, MAX_LINE_LENGTH, GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
 
         temp = data +
-            sprintf(data, "qid\tcount\tlimit\tlength\tindex\tdone\tcrypto\n");
+            sprintf(data, "qid\tflags\t\tcount\tlimit\tlength\tindex\tdma done\tdone\n");
 
         queue_for_each(intf->rt2x00dev, queue) {
-                spin_lock_irqsave(&queue->lock, irqflags);
+                spin_lock_irqsave(&queue->index_lock, irqflags);
 
-                temp += sprintf(temp, "%d\t%d\t%d\t%d\t%d\t%d\t%d\n", queue->qid,
+                temp += sprintf(temp, "%d\t0x%.8x\t%d\t%d\t%d\t%d\t%d\t\t%d\n",
+                                queue->qid, (unsigned int)queue->flags,
                                 queue->count, queue->limit, queue->length,
                                 queue->index[Q_INDEX],
-                                queue->index[Q_INDEX_DONE],
-                                queue->index[Q_INDEX_CRYPTO]);
+                                queue->index[Q_INDEX_DMA_DONE],
+                                queue->index[Q_INDEX_DONE]);
 
-                spin_unlock_irqrestore(&queue->lock, irqflags);
+                spin_unlock_irqrestore(&queue->index_lock, irqflags);
         }
 
         size = strlen(data);
@@ -371,6 +375,7 @@ static const struct file_operations rt2x00debug_fop_queue_stats = {
         .read           = rt2x00debug_read_queue_stats,
         .open           = rt2x00debug_file_open,
         .release        = rt2x00debug_file_release,
+        .llseek         = default_llseek,
 };
 
 #ifdef CONFIG_RT2X00_LIB_CRYPTO
@@ -380,7 +385,7 @@ static ssize_t rt2x00debug_read_crypto_stats(struct file *file,
                                              loff_t *offset)
 {
         struct rt2x00debug_intf *intf = file->private_data;
-        char *name[] = { "WEP64", "WEP128", "TKIP", "AES" };
+        static const char * const name[] = { "WEP64", "WEP128", "TKIP", "AES" };
         char *data;
         char *temp;
         size_t size;
@@ -423,6 +428,7 @@ static const struct file_operations rt2x00debug_fop_crypto_stats = {
         .read           = rt2x00debug_read_crypto_stats,
         .open           = rt2x00debug_file_open,
         .release        = rt2x00debug_file_release,
+        .llseek         = default_llseek,
 };
 #endif
 
@@ -481,6 +487,9 @@ static ssize_t rt2x00debug_write_##__name(struct file *file,	\
         if (index >= debug->__name.word_count)                  \
                 return -EINVAL;                                 \
                                                                 \
+        if (length > sizeof(line))                              \
+                return -EINVAL;                                 \
+                                                                \
         if (copy_from_user(line, buf, length))                  \
                 return -EFAULT;                                 \
                                                                 \
@@ -509,6 +518,7 @@ static const struct file_operations rt2x00debug_fop_##__name = {\
         .write          = rt2x00debug_write_##__name,           \
         .open           = rt2x00debug_file_open,                \
         .release        = rt2x00debug_file_release,             \
+        .llseek         = generic_file_llseek,                  \
 };
 
 RT2X00DEBUGFS_OPS(csr, "0x%.8x\n", u32);
@@ -542,6 +552,36 @@ static const struct file_operations rt2x00debug_fop_dev_flags = {
         .read           = rt2x00debug_read_dev_flags,
         .open           = rt2x00debug_file_open,
         .release        = rt2x00debug_file_release,
+        .llseek         = default_llseek,
+};
+
+static ssize_t rt2x00debug_read_cap_flags(struct file *file,
+                                          char __user *buf,
+                                          size_t length,
+                                          loff_t *offset)
+{
+        struct rt2x00debug_intf *intf = file->private_data;
+        char line[16];
+        size_t size;
+
+        if (*offset)
+                return 0;
+
+        size = sprintf(line, "0x%.8x\n", (unsigned int)intf->rt2x00dev->cap_flags);
+
+        if (copy_to_user(buf, line, size))
+                return -EFAULT;
+
+        *offset += size;
+        return size;
+}
+
+static const struct file_operations rt2x00debug_fop_cap_flags = {
+        .owner          = THIS_MODULE,
+        .read           = rt2x00debug_read_cap_flags,
+        .open           = rt2x00debug_file_open,
+        .release        = rt2x00debug_file_release,
+        .llseek         = default_llseek,
 };
 
 static struct dentry *rt2x00debug_create_file_driver(const char *name,
@@ -559,7 +599,6 @@ static struct dentry *rt2x00debug_create_file_driver(const char *name,
         blob->data = data;
         data += sprintf(data, "driver:\t%s\n", intf->rt2x00dev->ops->name);
         data += sprintf(data, "version:\t%s\n", DRV_VERSION);
-        data += sprintf(data, "compiled:\t%s %s\n", __DATE__, __TIME__);
         blob->size = strlen(blob->data);
 
         return debugfs_create_blob(name, S_IRUSR, intf->driver_folder, blob);
@@ -644,6 +683,12 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
         if (IS_ERR(intf->dev_flags) || !intf->dev_flags)
                 goto exit;
 
+        intf->cap_flags = debugfs_create_file("cap_flags", S_IRUSR,
+                                              intf->driver_folder, intf,
+                                              &rt2x00debug_fop_cap_flags);
+        if (IS_ERR(intf->cap_flags) || !intf->cap_flags)
+                goto exit;
+
         intf->register_folder =
             debugfs_create_dir("register", intf->driver_folder);
         if (IS_ERR(intf->register_folder) || !intf->register_folder)
@@ -697,7 +742,7 @@ void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
                                 intf, &rt2x00debug_fop_queue_stats);
 
 #ifdef CONFIG_RT2X00_LIB_CRYPTO
-        if (test_bit(CONFIG_SUPPORT_HW_CRYPTO, &rt2x00dev->flags))
+        if (test_bit(CAPABILITY_HW_CRYPTO, &rt2x00dev->cap_flags))
                 intf->crypto_stats_entry =
                     debugfs_create_file("crypto", S_IRUGO, intf->queue_folder,
                                         intf, &rt2x00debug_fop_crypto_stats);
@@ -735,6 +780,7 @@ void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev)
         debugfs_remove(intf->csr_off_entry);
         debugfs_remove(intf->register_folder);
         debugfs_remove(intf->dev_flags);
+        debugfs_remove(intf->cap_flags);
         debugfs_remove(intf->chipset_entry);
         debugfs_remove(intf->driver_entry);
         debugfs_remove(intf->driver_folder);