summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-07-10 19:32:09 +0200
committerJohn W. Linville <linville@tuxdriver.com>2007-07-12 16:07:25 -0400
commitfda6cc7ac45f97d4d40cc42781041dec488fa78c (patch)
treedcb49dd5b16004c65c016a28bec485e0e413df63
parent9771f740c6319e67bab44d18b9717c894a6f266d (diff)
[PATCH] mac80211: remove PRISM2_PARAM_DROP_UNENCRYPTED ioctl
Interestingly, wpa_supplicant doesn't use it, but uses the currently unsupported IW_AUTH_DROP_UNENCRYPTED. So I guess it doesn't matter anyway. 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.h1
-rw-r--r--net/mac80211/ieee80211_ioctl.c8
2 files changed, 0 insertions, 9 deletions
diff --git a/net/mac80211/hostapd_ioctl.h b/net/mac80211/hostapd_ioctl.h
index 230eb4400ec6..95ca1f983a72 100644
--- a/net/mac80211/hostapd_ioctl.h
+++ b/net/mac80211/hostapd_ioctl.h
@@ -29,7 +29,6 @@ enum {
/* Instant802 additions */
PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES = 1001,
- PRISM2_PARAM_DROP_UNENCRYPTED = 1002,
PRISM2_PARAM_PREAMBLE = 1003,
PRISM2_PARAM_SHORT_SLOT_TIME = 1006,
PRISM2_PARAM_NEXT_MODE = 1008,
diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c
index ab09e9a90f43..f465d0a1c153 100644
--- a/net/mac80211/ieee80211_ioctl.c
+++ b/net/mac80211/ieee80211_ioctl.c
@@ -1201,10 +1201,6 @@ static int ieee80211_ioctl_prism2_param(struct net_device *dev,
local->cts_protect_erp_frames = value;
break;
- case PRISM2_PARAM_DROP_UNENCRYPTED:
- sdata->drop_unencrypted = value;
- break;
-
case PRISM2_PARAM_PREAMBLE:
local->short_preamble = value;
break;
@@ -1332,10 +1328,6 @@ static int ieee80211_ioctl_get_prism2_param(struct net_device *dev,
*param = local->cts_protect_erp_frames;
break;
- case PRISM2_PARAM_DROP_UNENCRYPTED:
- *param = sdata->drop_unencrypted;
- break;
-
case PRISM2_PARAM_PREAMBLE:
*param = local->short_preamble;
break;