mac80211: update to wireless-testing 2011-04-19, contains several beacon related...
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 540-mac80211_remove_wds_sta_flag.patch
1 --- a/net/mac80211/sta_info.h
2 +++ b/net/mac80211/sta_info.h
3 @@ -31,7 +31,6 @@
4 * frames.
5 * @WLAN_STA_ASSOC_AP: We're associated to that station, it is an AP.
6 * @WLAN_STA_WME: Station is a QoS-STA.
7 - * @WLAN_STA_WDS: Station is one of our WDS peers.
8 * @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
9 * IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
10 * frame to this station is transmitted.
11 @@ -54,7 +53,6 @@ enum ieee80211_sta_info_flags {
12 WLAN_STA_SHORT_PREAMBLE = 1<<4,
13 WLAN_STA_ASSOC_AP = 1<<5,
14 WLAN_STA_WME = 1<<6,
15 - WLAN_STA_WDS = 1<<7,
16 WLAN_STA_CLEAR_PS_FILT = 1<<9,
17 WLAN_STA_MFP = 1<<10,
18 WLAN_STA_BLOCK_BA = 1<<11,
19 --- a/net/mac80211/debugfs_sta.c
20 +++ b/net/mac80211/debugfs_sta.c
21 @@ -59,7 +59,7 @@ static ssize_t sta_flags_read(struct fil
22 char buf[100];
23 struct sta_info *sta = file->private_data;
24 u32 staflags = get_sta_flags(sta);
25 - int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s%s",
26 + int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s",
27 staflags & WLAN_STA_AUTH ? "AUTH\n" : "",
28 staflags & WLAN_STA_ASSOC ? "ASSOC\n" : "",
29 staflags & WLAN_STA_PS_STA ? "PS (sta)\n" : "",
30 @@ -67,7 +67,6 @@ static ssize_t sta_flags_read(struct fil
31 staflags & WLAN_STA_AUTHORIZED ? "AUTHORIZED\n" : "",
32 staflags & WLAN_STA_SHORT_PREAMBLE ? "SHORT PREAMBLE\n" : "",
33 staflags & WLAN_STA_WME ? "WME\n" : "",
34 - staflags & WLAN_STA_WDS ? "WDS\n" : "",
35 staflags & WLAN_STA_MFP ? "MFP\n" : "");
36 return simple_read_from_buffer(userbuf, count, ppos, buf, res);
37 }