diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2007-07-10 13:32:09 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2007-07-12 16:07:25 -0400 |
commit | 9771f740c6319e67bab44d18b9717c894a6f266d (patch) | |
tree | e7f3e2866c8fc25928eed995fc99512330a186c8 | |
parent | 3ef8bed4692a0de6a47d162196c850c5dea85b70 (diff) |
[PATCH] mac80211: kill antenna select ioctls
Not used anywhere.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Jiri Benc <jbenc@suse.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | net/mac80211/hostapd_ioctl.h | 2 | ||||
-rw-r--r-- | net/mac80211/ieee80211_ioctl.c | 20 |
2 files changed, 0 insertions, 22 deletions
diff --git a/net/mac80211/hostapd_ioctl.h b/net/mac80211/hostapd_ioctl.h index 252204fd0abb..230eb4400ec6 100644 --- a/net/mac80211/hostapd_ioctl.h +++ b/net/mac80211/hostapd_ioctl.h | |||
@@ -26,8 +26,6 @@ | |||
26 | * mess shall be deleted completely. */ | 26 | * mess shall be deleted completely. */ |
27 | enum { | 27 | enum { |
28 | PRISM2_PARAM_IEEE_802_1X = 23, | 28 | PRISM2_PARAM_IEEE_802_1X = 23, |
29 | PRISM2_PARAM_ANTSEL_TX = 24, | ||
30 | PRISM2_PARAM_ANTSEL_RX = 25, | ||
31 | 29 | ||
32 | /* Instant802 additions */ | 30 | /* Instant802 additions */ |
33 | PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES = 1001, | 31 | PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES = 1001, |
diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c index f404f1f4251d..ab09e9a90f43 100644 --- a/net/mac80211/ieee80211_ioctl.c +++ b/net/mac80211/ieee80211_ioctl.c | |||
@@ -1197,18 +1197,6 @@ static int ieee80211_ioctl_prism2_param(struct net_device *dev, | |||
1197 | sdata->ieee802_1x = value; | 1197 | sdata->ieee802_1x = value; |
1198 | break; | 1198 | break; |
1199 | 1199 | ||
1200 | case PRISM2_PARAM_ANTSEL_TX: | ||
1201 | local->hw.conf.antenna_sel_tx = value; | ||
1202 | if (ieee80211_hw_config(local)) | ||
1203 | ret = -EINVAL; | ||
1204 | break; | ||
1205 | |||
1206 | case PRISM2_PARAM_ANTSEL_RX: | ||
1207 | local->hw.conf.antenna_sel_rx = value; | ||
1208 | if (ieee80211_hw_config(local)) | ||
1209 | ret = -EINVAL; | ||
1210 | break; | ||
1211 | |||
1212 | case PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES: | 1200 | case PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES: |
1213 | local->cts_protect_erp_frames = value; | 1201 | local->cts_protect_erp_frames = value; |
1214 | break; | 1202 | break; |
@@ -1340,14 +1328,6 @@ static int ieee80211_ioctl_get_prism2_param(struct net_device *dev, | |||
1340 | *param = sdata->ieee802_1x; | 1328 | *param = sdata->ieee802_1x; |
1341 | break; | 1329 | break; |
1342 | 1330 | ||
1343 | case PRISM2_PARAM_ANTSEL_TX: | ||
1344 | *param = local->hw.conf.antenna_sel_tx; | ||
1345 | break; | ||
1346 | |||
1347 | case PRISM2_PARAM_ANTSEL_RX: | ||
1348 | *param = local->hw.conf.antenna_sel_rx; | ||
1349 | break; | ||
1350 | |||
1351 | case PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES: | 1331 | case PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES: |
1352 | *param = local->cts_protect_erp_frames; | 1332 | *param = local->cts_protect_erp_frames; |
1353 | break; | 1333 | break; |