nfsd4: set shorter timeout

[safe/jmp/linux-2.6] / net / mac80211 / debugfs_sta.c

diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index 5824eb2..90230c7 100644 (file)
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@ -67,14 +67,15 @@ static ssize_t sta_flags_read(struct file *file, char __user *userbuf,
        char buf[100];
        struct sta_info *sta = file->private_data;
        u32 staflags = get_sta_flags(sta);
-       int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s",
+       int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s",
                staflags & WLAN_STA_AUTH ? "AUTH\n" : "",
                staflags & WLAN_STA_ASSOC ? "ASSOC\n" : "",
                staflags & WLAN_STA_PS ? "PS\n" : "",
                staflags & WLAN_STA_AUTHORIZED ? "AUTHORIZED\n" : "",
                staflags & WLAN_STA_SHORT_PREAMBLE ? "SHORT PREAMBLE\n" : "",
                staflags & WLAN_STA_WME ? "WME\n" : "",
-               staflags & WLAN_STA_WDS ? "WDS\n" : "");
+               staflags & WLAN_STA_WDS ? "WDS\n" : "",
+               staflags & WLAN_STA_MFP ? "MFP\n" : "");
        return simple_read_from_buffer(userbuf, count, ppos, buf, res);
 }
 STA_OPS(flags);
@@ -137,7 +138,7 @@ static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf,
        p += scnprintf(p, sizeof(buf)+buf-p, "\n DTKN:");
        for (i = 0; i < STA_TID_NUM; i++)
                p += scnprintf(p, sizeof(buf)+buf-p, "%5d",
-                       sta->ampdu_mlme.tid_state_rx[i]?
+                       sta->ampdu_mlme.tid_state_rx[i] ?
                        sta->ampdu_mlme.tid_rx[i]->dialog_token : 0);
 
        p += scnprintf(p, sizeof(buf)+buf-p, "\n TX  :");
@@ -148,13 +149,13 @@ static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf,
        p += scnprintf(p, sizeof(buf)+buf-p, "\n DTKN:");
        for (i = 0; i < STA_TID_NUM; i++)
                p += scnprintf(p, sizeof(buf)+buf-p, "%5d",
-                       sta->ampdu_mlme.tid_state_tx[i]?
+                       sta->ampdu_mlme.tid_state_tx[i] ?
                        sta->ampdu_mlme.tid_tx[i]->dialog_token : 0);
 
        p += scnprintf(p, sizeof(buf)+buf-p, "\n SSN :");
        for (i = 0; i < STA_TID_NUM; i++)
                p += scnprintf(p, sizeof(buf)+buf-p, "%5d",
-                       sta->ampdu_mlme.tid_state_tx[i]?
+                       sta->ampdu_mlme.tid_state_tx[i] ?
                        sta->ampdu_mlme.tid_tx[i]->ssn : 0);
 
        p += scnprintf(p, sizeof(buf)+buf-p, "\n");