mac80211: uAPSD - fix IEEE80211_FCTL_MOREDATA bit setting
[pandora-kernel.git] / net / mac80211 / debugfs.c
index 51f0d78..883996b 100644 (file)
@@ -37,7 +37,7 @@ int mac80211_format_buffer(char __user *userbuf, size_t count,
        return simple_read_from_buffer(userbuf, count, ppos, buf, res);
 }
 
-#define DEBUGFS_READONLY_FILE(name, fmt, value...)                     \
+#define DEBUGFS_READONLY_FILE_FN(name, fmt, value...)                  \
 static ssize_t name## _read(struct file *file, char __user *userbuf,   \
                            size_t count, loff_t *ppos)                 \
 {                                                                      \
@@ -45,14 +45,19 @@ static ssize_t name## _read(struct file *file, char __user *userbuf,        \
                                                                        \
        return mac80211_format_buffer(userbuf, count, ppos,             \
                                      fmt "\n", ##value);               \
-}                                                                      \
-                                                                       \
+}
+
+#define DEBUGFS_READONLY_FILE_OPS(name)                        \
 static const struct file_operations name## _ops = {                    \
        .read = name## _read,                                           \
        .open = mac80211_open_file_generic,                             \
        .llseek = generic_file_llseek,                                  \
 };
 
+#define DEBUGFS_READONLY_FILE(name, fmt, value...)             \
+       DEBUGFS_READONLY_FILE_FN(name, fmt, value)              \
+       DEBUGFS_READONLY_FILE_OPS(name)
+
 #define DEBUGFS_ADD(name)                                              \
        debugfs_create_file(#name, 0400, phyd, local, &name## _ops);
 
@@ -73,64 +78,13 @@ DEBUGFS_READONLY_FILE(wep_iv, "%#08x",
 DEBUGFS_READONLY_FILE(rate_ctrl_alg, "%s",
        local->rate_ctrl ? local->rate_ctrl->ops->name : "hw/driver");
 
-static ssize_t tsf_read(struct file *file, char __user *user_buf,
-                            size_t count, loff_t *ppos)
-{
-       struct ieee80211_local *local = file->private_data;
-       u64 tsf;
-
-       tsf = drv_get_tsf(local);
-
-       return mac80211_format_buffer(user_buf, count, ppos, "0x%016llx\n",
-                                     (unsigned long long) tsf);
-}
-
-static ssize_t tsf_write(struct file *file,
-                         const char __user *user_buf,
-                         size_t count, loff_t *ppos)
-{
-       struct ieee80211_local *local = file->private_data;
-       unsigned long long tsf;
-       char buf[100];
-       size_t len;
-
-       len = min(count, sizeof(buf) - 1);
-       if (copy_from_user(buf, user_buf, len))
-               return -EFAULT;
-       buf[len] = '\0';
-
-       if (strncmp(buf, "reset", 5) == 0) {
-               if (local->ops->reset_tsf) {
-                       drv_reset_tsf(local);
-                       wiphy_info(local->hw.wiphy, "debugfs reset TSF\n");
-               }
-       } else {
-               tsf = simple_strtoul(buf, NULL, 0);
-               if (local->ops->set_tsf) {
-                       drv_set_tsf(local, tsf);
-                       wiphy_info(local->hw.wiphy,
-                                  "debugfs set TSF to %#018llx\n", tsf);
-
-               }
-       }
-
-       return count;
-}
-
-static const struct file_operations tsf_ops = {
-       .read = tsf_read,
-       .write = tsf_write,
-       .open = mac80211_open_file_generic,
-       .llseek = default_llseek,
-};
-
 static ssize_t reset_write(struct file *file, const char __user *user_buf,
                           size_t count, loff_t *ppos)
 {
        struct ieee80211_local *local = file->private_data;
 
        rtnl_lock();
-       __ieee80211_suspend(&local->hw);
+       __ieee80211_suspend(&local->hw, NULL);
        __ieee80211_resume(&local->hw);
        rtnl_unlock();
 
@@ -190,20 +144,12 @@ static ssize_t uapsd_queues_write(struct file *file,
                                  size_t count, loff_t *ppos)
 {
        struct ieee80211_local *local = file->private_data;
-       unsigned long val;
-       char buf[10];
-       size_t len;
+       u8 val;
        int ret;
 
-       len = min(count, sizeof(buf) - 1);
-       if (copy_from_user(buf, user_buf, len))
-               return -EFAULT;
-       buf[len] = '\0';
-
-       ret = strict_strtoul(buf, 0, &val);
-
+       ret = kstrtou8_from_user(user_buf, count, 0, &val);
        if (ret)
-               return -EINVAL;
+               return ret;
 
        if (val & ~IEEE80211_WMM_IE_STA_QOSINFO_AC_MASK)
                return -ERANGE;
@@ -291,11 +237,75 @@ static ssize_t channel_type_read(struct file *file, char __user *user_buf,
        return simple_read_from_buffer(user_buf, count, ppos, buf, strlen(buf));
 }
 
-static const struct file_operations channel_type_ops = {
-       .read = channel_type_read,
-       .open = mac80211_open_file_generic,
-       .llseek = default_llseek,
-};
+static ssize_t hwflags_read(struct file *file, char __user *user_buf,
+                           size_t count, loff_t *ppos)
+{
+       struct ieee80211_local *local = file->private_data;
+       int mxln = 500;
+       ssize_t rv;
+       char *buf = kzalloc(mxln, GFP_KERNEL);
+       int sf = 0; /* how many written so far */
+
+       if (!buf)
+               return 0;
+
+       sf += snprintf(buf, mxln - sf, "0x%x\n", local->hw.flags);
+       if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL)
+               sf += snprintf(buf + sf, mxln - sf, "HAS_RATE_CONTROL\n");
+       if (local->hw.flags & IEEE80211_HW_RX_INCLUDES_FCS)
+               sf += snprintf(buf + sf, mxln - sf, "RX_INCLUDES_FCS\n");
+       if (local->hw.flags & IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING)
+               sf += snprintf(buf + sf, mxln - sf,
+                              "HOST_BCAST_PS_BUFFERING\n");
+       if (local->hw.flags & IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE)
+               sf += snprintf(buf + sf, mxln - sf,
+                              "2GHZ_SHORT_SLOT_INCAPABLE\n");
+       if (local->hw.flags & IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE)
+               sf += snprintf(buf + sf, mxln - sf,
+                              "2GHZ_SHORT_PREAMBLE_INCAPABLE\n");
+       if (local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC)
+               sf += snprintf(buf + sf, mxln - sf, "SIGNAL_UNSPEC\n");
+       if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM)
+               sf += snprintf(buf + sf, mxln - sf, "SIGNAL_DBM\n");
+       if (local->hw.flags & IEEE80211_HW_NEED_DTIM_PERIOD)
+               sf += snprintf(buf + sf, mxln - sf, "NEED_DTIM_PERIOD\n");
+       if (local->hw.flags & IEEE80211_HW_SPECTRUM_MGMT)
+               sf += snprintf(buf + sf, mxln - sf, "SPECTRUM_MGMT\n");
+       if (local->hw.flags & IEEE80211_HW_AMPDU_AGGREGATION)
+               sf += snprintf(buf + sf, mxln - sf, "AMPDU_AGGREGATION\n");
+       if (local->hw.flags & IEEE80211_HW_SUPPORTS_PS)
+               sf += snprintf(buf + sf, mxln - sf, "SUPPORTS_PS\n");
+       if (local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK)
+               sf += snprintf(buf + sf, mxln - sf, "PS_NULLFUNC_STACK\n");
+       if (local->hw.flags & IEEE80211_HW_SUPPORTS_DYNAMIC_PS)
+               sf += snprintf(buf + sf, mxln - sf, "SUPPORTS_DYNAMIC_PS\n");
+       if (local->hw.flags & IEEE80211_HW_MFP_CAPABLE)
+               sf += snprintf(buf + sf, mxln - sf, "MFP_CAPABLE\n");
+       if (local->hw.flags & IEEE80211_HW_BEACON_FILTER)
+               sf += snprintf(buf + sf, mxln - sf, "BEACON_FILTER\n");
+       if (local->hw.flags & IEEE80211_HW_SUPPORTS_STATIC_SMPS)
+               sf += snprintf(buf + sf, mxln - sf, "SUPPORTS_STATIC_SMPS\n");
+       if (local->hw.flags & IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS)
+               sf += snprintf(buf + sf, mxln - sf, "SUPPORTS_DYNAMIC_SMPS\n");
+       if (local->hw.flags & IEEE80211_HW_SUPPORTS_UAPSD)
+               sf += snprintf(buf + sf, mxln - sf, "SUPPORTS_UAPSD\n");
+       if (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS)
+               sf += snprintf(buf + sf, mxln - sf, "REPORTS_TX_ACK_STATUS\n");
+       if (local->hw.flags & IEEE80211_HW_CONNECTION_MONITOR)
+               sf += snprintf(buf + sf, mxln - sf, "CONNECTION_MONITOR\n");
+       if (local->hw.flags & IEEE80211_HW_SUPPORTS_CQM_RSSI)
+               sf += snprintf(buf + sf, mxln - sf, "SUPPORTS_CQM_RSSI\n");
+       if (local->hw.flags & IEEE80211_HW_SUPPORTS_PER_STA_GTK)
+               sf += snprintf(buf + sf, mxln - sf, "SUPPORTS_PER_STA_GTK\n");
+       if (local->hw.flags & IEEE80211_HW_AP_LINK_PS)
+               sf += snprintf(buf + sf, mxln - sf, "AP_LINK_PS\n");
+       if (local->hw.flags & IEEE80211_HW_TX_AMPDU_SETUP_IN_HW)
+               sf += snprintf(buf + sf, mxln - sf, "TX_AMPDU_SETUP_IN_HW\n");
+
+       rv = simple_read_from_buffer(user_buf, count, ppos, buf, strlen(buf));
+       kfree(buf);
+       return rv;
+}
 
 static ssize_t queues_read(struct file *file, char __user *user_buf,
                           size_t count, loff_t *ppos)
@@ -315,11 +325,9 @@ static ssize_t queues_read(struct file *file, char __user *user_buf,
        return simple_read_from_buffer(user_buf, count, ppos, buf, res);
 }
 
-static const struct file_operations queues_ops = {
-       .read = queues_read,
-       .open = mac80211_open_file_generic,
-       .llseek = default_llseek,
-};
+DEBUGFS_READONLY_FILE_OPS(hwflags);
+DEBUGFS_READONLY_FILE_OPS(channel_type);
+DEBUGFS_READONLY_FILE_OPS(queues);
 
 /* statistics stuff */
 
@@ -388,13 +396,13 @@ void debugfs_hw_add(struct ieee80211_local *local)
        DEBUGFS_ADD(frequency);
        DEBUGFS_ADD(total_ps_buffered);
        DEBUGFS_ADD(wep_iv);
-       DEBUGFS_ADD(tsf);
        DEBUGFS_ADD(queues);
        DEBUGFS_ADD_MODE(reset, 0200);
        DEBUGFS_ADD(noack);
        DEBUGFS_ADD(uapsd_queues);
        DEBUGFS_ADD(uapsd_max_sp_len);
        DEBUGFS_ADD(channel_type);
+       DEBUGFS_ADD(hwflags);
        DEBUGFS_ADD(user_power);
        DEBUGFS_ADD(power);