浏览代码

[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>
Johannes Berg 18 年之前
父节点
当前提交
fda6cc7ac4
共有 2 个文件被更改,包括 0 次插入9 次删除
  1. 0 1
      net/mac80211/hostapd_ioctl.h
  2. 0 8
      net/mac80211/ieee80211_ioctl.c

+ 0 - 1
net/mac80211/hostapd_ioctl.h

@@ -29,7 +29,6 @@ enum {
 
 
 	/* Instant802 additions */
 	/* Instant802 additions */
 	PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES = 1001,
 	PRISM2_PARAM_CTS_PROTECT_ERP_FRAMES = 1001,
-	PRISM2_PARAM_DROP_UNENCRYPTED = 1002,
 	PRISM2_PARAM_PREAMBLE = 1003,
 	PRISM2_PARAM_PREAMBLE = 1003,
 	PRISM2_PARAM_SHORT_SLOT_TIME = 1006,
 	PRISM2_PARAM_SHORT_SLOT_TIME = 1006,
 	PRISM2_PARAM_NEXT_MODE = 1008,
 	PRISM2_PARAM_NEXT_MODE = 1008,

+ 0 - 8
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;
 		local->cts_protect_erp_frames = value;
 		break;
 		break;
 
 
-	case PRISM2_PARAM_DROP_UNENCRYPTED:
-		sdata->drop_unencrypted = value;
-		break;
-
 	case PRISM2_PARAM_PREAMBLE:
 	case PRISM2_PARAM_PREAMBLE:
 		local->short_preamble = value;
 		local->short_preamble = value;
 		break;
 		break;
@@ -1332,10 +1328,6 @@ static int ieee80211_ioctl_get_prism2_param(struct net_device *dev,
 		*param = local->cts_protect_erp_frames;
 		*param = local->cts_protect_erp_frames;
 		break;
 		break;
 
 
-	case PRISM2_PARAM_DROP_UNENCRYPTED:
-		*param = sdata->drop_unencrypted;
-		break;
-
 	case PRISM2_PARAM_PREAMBLE:
 	case PRISM2_PARAM_PREAMBLE:
 		*param = local->short_preamble;
 		*param = local->short_preamble;
 		break;
 		break;