From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from crystal.sipsolutions.net ([195.210.38.204]:47480 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759428AbXHUPGT (ORCPT ); Tue, 21 Aug 2007 11:06:19 -0400 Message-Id: <20070821150043.054208000@sipsolutions.net> References: <20070821145905.689978000@sipsolutions.net> Date: Tue, 21 Aug 2007 16:59:14 +0200 From: Johannes Berg To: John Linville Cc: Jiri Benc , Michael Wu , linux-wireless@vger.kernel.org Subject: [PATCH 09/27] mac80211: remove PRISM2_HOSTAPD_SET_GENERIC_INFO_ELEM Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: This is now unused in hostapd/wpa_supplicant, it uses SIOCSIWGENIE. Signed-off-by: Johannes Berg --- net/mac80211/hostapd_ioctl.h | 5 ----- net/mac80211/ieee80211_ioctl.c | 20 -------------------- 2 files changed, 25 deletions(-) --- wireless-dev.orig/net/mac80211/hostapd_ioctl.h 2007-08-21 14:40:10.365923881 +0200 +++ wireless-dev/net/mac80211/hostapd_ioctl.h 2007-08-21 14:40:10.985923881 +0200 @@ -84,7 +84,6 @@ enum { PRISM2_HOSTAPD_GET_DOT11COUNTERSTABLE = 1008, PRISM2_HOSTAPD_GET_LOAD_STATS = 1009, PRISM2_HOSTAPD_SET_STA_VLAN = 1010, - PRISM2_HOSTAPD_SET_GENERIC_INFO_ELEM = 1011, PRISM2_HOSTAPD_SET_CHANNEL_FLAG = 1012, PRISM2_HOSTAPD_SET_REGULATORY_DOMAIN = 1013, PRISM2_HOSTAPD_SET_TX_QUEUE_PARAMS = 1014, @@ -199,10 +198,6 @@ struct prism2_hostapd_param { int vlan_id; } set_sta_vlan; struct { - u8 len; - u8 data[0] ALIGNED; - } set_generic_info_elem; - struct { u16 mode; /* MODE_* */ u16 chan; u32 flag; --- wireless-dev.orig/net/mac80211/ieee80211_ioctl.c 2007-08-21 14:40:10.375923881 +0200 +++ wireless-dev/net/mac80211/ieee80211_ioctl.c 2007-08-21 14:40:10.985923881 +0200 @@ -1131,22 +1131,6 @@ static int ieee80211_set_gen_ie(struct n } -static int -ieee80211_ioctl_set_generic_info_elem(struct net_device *dev, - struct prism2_hostapd_param *param, - int param_len) -{ - u8 *pos = param->u.set_generic_info_elem.data; - int left = param_len - ((u8 *) pos - (u8 *) param); - int len = param->u.set_generic_info_elem.len; - - if (left < len) - return -EINVAL; - - return ieee80211_set_gen_ie(dev, pos, len); -} - - static int ieee80211_ioctl_set_regulatory_domain(struct net_device *dev, struct prism2_hostapd_param *param) { @@ -1338,10 +1322,6 @@ static int ieee80211_ioctl_priv_hostapd( case PRISM2_HOSTAPD_SET_STA_VLAN: ret = ieee80211_ioctl_set_sta_vlan(dev, param); break; - case PRISM2_HOSTAPD_SET_GENERIC_INFO_ELEM: - ret = ieee80211_ioctl_set_generic_info_elem(dev, param, - p->length); - break; case PRISM2_HOSTAPD_SET_CHANNEL_FLAG: ret = ieee80211_ioctl_set_channel_flag(dev, param); break; --