diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2007-08-28 17:01:52 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:48:41 -0400 |
commit | e6660d9832f62e97941492b83eccbe370dfa72ba (patch) | |
tree | 3e0f5ea7d342634125114eddceb673c182887fc8 | |
parent | 0ef6e49b75d0d64d5deab890c72d19fe86488f73 (diff) |
[MAC80211]: remove PRISM2_PARAM_RADIO_ENABLED
This now is unused in hostapd/wpa_supplicant.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/mac80211/hostapd_ioctl.h | 1 | ||||
-rw-r--r-- | net/mac80211/ieee80211_ioctl.c | 14 |
2 files changed, 0 insertions, 15 deletions
diff --git a/net/mac80211/hostapd_ioctl.h b/net/mac80211/hostapd_ioctl.h index 52da513f060a..77a5c8813aee 100644 --- a/net/mac80211/hostapd_ioctl.h +++ b/net/mac80211/hostapd_ioctl.h | |||
@@ -32,7 +32,6 @@ enum { | |||
32 | PRISM2_PARAM_PREAMBLE = 1003, | 32 | PRISM2_PARAM_PREAMBLE = 1003, |
33 | PRISM2_PARAM_SHORT_SLOT_TIME = 1006, | 33 | PRISM2_PARAM_SHORT_SLOT_TIME = 1006, |
34 | PRISM2_PARAM_NEXT_MODE = 1008, | 34 | PRISM2_PARAM_NEXT_MODE = 1008, |
35 | PRISM2_PARAM_RADIO_ENABLED = 1010, | ||
36 | PRISM2_PARAM_ANTENNA_MODE = 1013, | 35 | PRISM2_PARAM_ANTENNA_MODE = 1013, |
37 | PRISM2_PARAM_STAT_TIME = 1016, | 36 | PRISM2_PARAM_STAT_TIME = 1016, |
38 | PRISM2_PARAM_STA_ANTENNA_SEL = 1017, | 37 | PRISM2_PARAM_STA_ANTENNA_SEL = 1017, |
diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c index 0e88564e524a..b89fb1f2f241 100644 --- a/net/mac80211/ieee80211_ioctl.c +++ b/net/mac80211/ieee80211_ioctl.c | |||
@@ -287,16 +287,6 @@ static int ieee80211_ioctl_siwgenie(struct net_device *dev, | |||
287 | return -EOPNOTSUPP; | 287 | return -EOPNOTSUPP; |
288 | } | 288 | } |
289 | 289 | ||
290 | static int ieee80211_ioctl_set_radio_enabled(struct net_device *dev, | ||
291 | int val) | ||
292 | { | ||
293 | struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); | ||
294 | struct ieee80211_conf *conf = &local->hw.conf; | ||
295 | |||
296 | conf->radio_enabled = val; | ||
297 | return ieee80211_hw_config(wdev_priv(dev->ieee80211_ptr)); | ||
298 | } | ||
299 | |||
300 | static int ieee80211_ioctl_giwname(struct net_device *dev, | 290 | static int ieee80211_ioctl_giwname(struct net_device *dev, |
301 | struct iw_request_info *info, | 291 | struct iw_request_info *info, |
302 | char *name, char *extra) | 292 | char *name, char *extra) |
@@ -1107,10 +1097,6 @@ static int ieee80211_ioctl_prism2_param(struct net_device *dev, | |||
1107 | local->next_mode = value; | 1097 | local->next_mode = value; |
1108 | break; | 1098 | break; |
1109 | 1099 | ||
1110 | case PRISM2_PARAM_RADIO_ENABLED: | ||
1111 | ret = ieee80211_ioctl_set_radio_enabled(dev, value); | ||
1112 | break; | ||
1113 | |||
1114 | case PRISM2_PARAM_ANTENNA_MODE: | 1100 | case PRISM2_PARAM_ANTENNA_MODE: |
1115 | local->hw.conf.antenna_mode = value; | 1101 | local->hw.conf.antenna_mode = value; |
1116 | if (ieee80211_hw_config(local)) | 1102 | if (ieee80211_hw_config(local)) |