970252faf8
SVN-Revision: 26744
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
--- a/net/mac80211/sta_info.h
|
|
+++ b/net/mac80211/sta_info.h
|
|
@@ -31,7 +31,6 @@
|
|
* frames.
|
|
* @WLAN_STA_ASSOC_AP: We're associated to that station, it is an AP.
|
|
* @WLAN_STA_WME: Station is a QoS-STA.
|
|
- * @WLAN_STA_WDS: Station is one of our WDS peers.
|
|
* @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
|
|
* IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
|
|
* frame to this station is transmitted.
|
|
@@ -54,7 +53,6 @@ enum ieee80211_sta_info_flags {
|
|
WLAN_STA_SHORT_PREAMBLE = 1<<4,
|
|
WLAN_STA_ASSOC_AP = 1<<5,
|
|
WLAN_STA_WME = 1<<6,
|
|
- WLAN_STA_WDS = 1<<7,
|
|
WLAN_STA_CLEAR_PS_FILT = 1<<9,
|
|
WLAN_STA_MFP = 1<<10,
|
|
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" : "",
|
|
staflags & WLAN_STA_WME ? "WME\n" : "",
|
|
- staflags & WLAN_STA_WDS ? "WDS\n" : "",
|
|
staflags & WLAN_STA_MFP ? "MFP\n" : "");
|
|
return simple_read_from_buffer(userbuf, count, ppos, buf, res);
|
|
}
|