lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: Remove local->scan_flags

Browse Source 
This patch removes all references to local->scan_flags as these are not
used anymore since the removal of prism2 ioctls.

Signed-off-by: Helmut Schaa <hschaa@suse.de>
Signed-off-by: Jiri Benc <jbenc@suse.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Helmut Schaa
2007-11-09 16:26:09 +01:00
committed by David S. Miller
parent dabeb344f5
commit 48933dea47
3 changed files with 3 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac80211/ieee80211_i.h
View File

@@ -483,10 +483,6 @@ struct ieee80211_local {
struct list_head sta_bss_list; struct list_head sta_bss_list;
struct ieee80211_sta_bss *sta_bss_hash[STA_HASH_SIZE]; struct ieee80211_sta_bss *sta_bss_hash[STA_HASH_SIZE];
spinlock_t sta_bss_lock; spinlock_t sta_bss_lock;
#define IEEE80211_SCAN_MATCH_SSID BIT(0)
#define IEEE80211_SCAN_WPA_ONLY BIT(1)
#define IEEE80211_SCAN_EXTRA_INFO BIT(2)
int scan_flags;
/* SNMP counters */ /* SNMP counters */
/* dot11CountersTable */ /* dot11CountersTable */

19
net/mac80211/ieee80211_ioctl.c
View File

@@ -513,7 +513,6 @@ static int ieee80211_ioctl_siwscan(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
struct iw_scan_req *req = NULL; struct iw_scan_req *req = NULL;
u8 *ssid = NULL; u8 *ssid = NULL;
@@ -522,21 +521,9 @@ static int ieee80211_ioctl_siwscan(struct net_device *dev,
if (!netif_running(dev)) if (!netif_running(dev))
return -ENETDOWN; return -ENETDOWN;
switch (sdata->type) { if (sdata->type != IEEE80211_IF_TYPE_STA &&
case IEEE80211_IF_TYPE_STA: sdata->type != IEEE80211_IF_TYPE_IBSS &&
case IEEE80211_IF_TYPE_IBSS: sdata->type != IEEE80211_IF_TYPE_AP) {
if (local->scan_flags & IEEE80211_SCAN_MATCH_SSID) {
ssid = sdata->u.sta.ssid;
ssid_len = sdata->u.sta.ssid_len;
}
break;
case IEEE80211_IF_TYPE_AP:
if (local->scan_flags & IEEE80211_SCAN_MATCH_SSID) {
ssid = sdata->u.ap.ssid;
ssid_len = sdata->u.ap.ssid_len;
}
break;
default:
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }

12
net/mac80211/ieee80211_sta.c
View File

@@ -2894,15 +2894,6 @@ ieee80211_sta_scan_result(struct net_device *dev,
if (!(local->enabled_modes & (1 << bss->hw_mode))) if (!(local->enabled_modes & (1 << bss->hw_mode)))
return current_ev; return current_ev;
if (local->scan_flags & IEEE80211_SCAN_WPA_ONLY &&
!bss->wpa_ie && !bss->rsn_ie)
return current_ev;
if (local->scan_flags & IEEE80211_SCAN_MATCH_SSID &&
(local->scan_ssid_len != bss->ssid_len ||
memcmp(local->scan_ssid, bss->ssid, bss->ssid_len) != 0))
return current_ev;
memset(&iwe, 0, sizeof(iwe)); memset(&iwe, 0, sizeof(iwe));
iwe.cmd = SIOCGIWAP; iwe.cmd = SIOCGIWAP;
iwe.u.ap_addr.sa_family = ARPHRD_ETHER; iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
@@ -3009,9 +3000,6 @@ ieee80211_sta_scan_result(struct net_device *dev,
do { do {
char *buf; char *buf;
if (!(local->scan_flags & IEEE80211_SCAN_EXTRA_INFO))
break;
buf = kmalloc(100, GFP_ATOMIC); buf = kmalloc(100, GFP_ATOMIC);
if (!buf) if (!buf)
break; break;