mac80211: merge some more fixes from trunk (fixes #9224)

[openwrt-10.03/.git] / package / mac80211 / patches / 550-mac80211_remove_wds_sta_flag.patch

diff --git a/package/mac80211/patches/550-mac80211_remove_wds_sta_flag.patch b/package/mac80211/patches/550-mac80211_remove_wds_sta_flag.patch
index f9925732bdfc8030baf527dac0809bb4d4a31bad..29c2fd7dad125cda49e2ae3d05123cca828961a4 100644 (file)
--- a/package/mac80211/patches/550-mac80211_remove_wds_sta_flag.patch
+++ b/package/mac80211/patches/550-mac80211_remove_wds_sta_flag.patch
@@ -18,6 +18,15 @@
        WLAN_STA_BLOCK_BA       = 1<<11,
 --- a/net/mac80211/debugfs_sta.c
 +++ b/net/mac80211/debugfs_sta.c
+@@ -59,7 +59,7 @@ static ssize_t sta_flags_read(struct fil
+       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%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_STA ? "PS (sta)\n" : "",
 @@ -67,7 +67,6 @@ static ssize_t sta_flags_read(struct fil
                staflags & WLAN_STA_AUTHORIZED ? "AUTHORIZED\n" : "",
                staflags & WLAN_STA_SHORT_PREAMBLE ? "SHORT PREAMBLE\n" : "",