aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/mac80211.h14
-rw-r--r--net/mac80211/debugfs.c4
-rw-r--r--net/mac80211/hostapd_ioctl.h2
-rw-r--r--net/mac80211/ieee80211_i.h1
-rw-r--r--net/mac80211/ieee80211_ioctl.c6
5 files changed, 0 insertions, 27 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 1c59e24544c7..029e8cb7bf4e 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -300,20 +300,6 @@ struct ieee80211_conf {
300 /* 0 = default/diversity, 1 = Ant0, 2 = Ant1 */ 300 /* 0 = default/diversity, 1 = Ant0, 2 = Ant1 */
301 u8 antenna_sel_tx; 301 u8 antenna_sel_tx;
302 u8 antenna_sel_rx; 302 u8 antenna_sel_rx;
303
304 /* Following five fields are used for IEEE 802.11H */
305 unsigned int radar_detect;
306 unsigned int spect_mgmt;
307 /* All following fields are currently unused. */
308 unsigned int quiet_duration; /* duration of quiet period */
309 unsigned int quiet_offset; /* how far into the beacon is the quiet
310 * period */
311 unsigned int quiet_period;
312 u8 radar_firpwr_threshold;
313 u8 radar_rssi_threshold;
314 u8 pulse_height_threshold;
315 u8 pulse_rssi_threshold;
316 u8 pulse_inband_threshold;
317}; 303};
318 304
319/** 305/**
diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
index 76c39eb72817..dc5ed1a8bf62 100644
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@ -86,8 +86,6 @@ DEBUGFS_READONLY_FILE(channel, 20, "%d",
86 local->hw.conf.channel); 86 local->hw.conf.channel);
87DEBUGFS_READONLY_FILE(frequency, 20, "%d", 87DEBUGFS_READONLY_FILE(frequency, 20, "%d",
88 local->hw.conf.freq); 88 local->hw.conf.freq);
89DEBUGFS_READONLY_FILE(radar_detect, 20, "%d",
90 local->hw.conf.radar_detect);
91DEBUGFS_READONLY_FILE(antenna_sel_tx, 20, "%d", 89DEBUGFS_READONLY_FILE(antenna_sel_tx, 20, "%d",
92 local->hw.conf.antenna_sel_tx); 90 local->hw.conf.antenna_sel_tx);
93DEBUGFS_READONLY_FILE(antenna_sel_rx, 20, "%d", 91DEBUGFS_READONLY_FILE(antenna_sel_rx, 20, "%d",
@@ -302,7 +300,6 @@ void debugfs_hw_add(struct ieee80211_local *local)
302 300
303 DEBUGFS_ADD(channel); 301 DEBUGFS_ADD(channel);
304 DEBUGFS_ADD(frequency); 302 DEBUGFS_ADD(frequency);
305 DEBUGFS_ADD(radar_detect);
306 DEBUGFS_ADD(antenna_sel_tx); 303 DEBUGFS_ADD(antenna_sel_tx);
307 DEBUGFS_ADD(antenna_sel_rx); 304 DEBUGFS_ADD(antenna_sel_rx);
308 DEBUGFS_ADD(bridge_packets); 305 DEBUGFS_ADD(bridge_packets);
@@ -366,7 +363,6 @@ void debugfs_hw_del(struct ieee80211_local *local)
366{ 363{
367 DEBUGFS_DEL(channel); 364 DEBUGFS_DEL(channel);
368 DEBUGFS_DEL(frequency); 365 DEBUGFS_DEL(frequency);
369 DEBUGFS_DEL(radar_detect);
370 DEBUGFS_DEL(antenna_sel_tx); 366 DEBUGFS_DEL(antenna_sel_tx);
371 DEBUGFS_DEL(antenna_sel_rx); 367 DEBUGFS_DEL(antenna_sel_rx);
372 DEBUGFS_DEL(bridge_packets); 368 DEBUGFS_DEL(bridge_packets);
diff --git a/net/mac80211/hostapd_ioctl.h b/net/mac80211/hostapd_ioctl.h
index 8d219d67db35..fd072cb24e50 100644
--- a/net/mac80211/hostapd_ioctl.h
+++ b/net/mac80211/hostapd_ioctl.h
@@ -39,8 +39,6 @@ enum {
39 PRISM2_PARAM_CREATE_IBSS = 1037, 39 PRISM2_PARAM_CREATE_IBSS = 1037,
40 PRISM2_PARAM_WMM_ENABLED = 1038, 40 PRISM2_PARAM_WMM_ENABLED = 1038,
41 PRISM2_PARAM_MIXED_CELL = 1039, 41 PRISM2_PARAM_MIXED_CELL = 1039,
42 PRISM2_PARAM_RADAR_DETECT = 1043,
43 PRISM2_PARAM_SPECTRUM_MGMT = 1044,
44}; 42};
45 43
46enum { 44enum {
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 2f6fff6317eb..c557d578aa30 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -563,7 +563,6 @@ struct ieee80211_local {
563 struct local_debugfsdentries { 563 struct local_debugfsdentries {
564 struct dentry *channel; 564 struct dentry *channel;
565 struct dentry *frequency; 565 struct dentry *frequency;
566 struct dentry *radar_detect;
567 struct dentry *antenna_sel_tx; 566 struct dentry *antenna_sel_tx;
568 struct dentry *antenna_sel_rx; 567 struct dentry *antenna_sel_rx;
569 struct dentry *bridge_packets; 568 struct dentry *bridge_packets;
diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c
index 2e85032808fe..785f437b306a 100644
--- a/net/mac80211/ieee80211_ioctl.c
+++ b/net/mac80211/ieee80211_ioctl.c
@@ -1125,12 +1125,6 @@ static int ieee80211_ioctl_prism2_param(struct net_device *dev,
1125 else 1125 else
1126 sdata->u.sta.wmm_enabled = !!value; 1126 sdata->u.sta.wmm_enabled = !!value;
1127 break; 1127 break;
1128 case PRISM2_PARAM_RADAR_DETECT:
1129 local->hw.conf.radar_detect = value;
1130 break;
1131 case PRISM2_PARAM_SPECTRUM_MGMT:
1132 local->hw.conf.spect_mgmt = value;
1133 break;
1134 default: 1128 default:
1135 ret = -EOPNOTSUPP; 1129 ret = -EOPNOTSUPP;
1136 break; 1130 break;