Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48933dea authored by Helmut Schaa's avatar Helmut Schaa Committed by David S. Miller
Browse files

mac80211: Remove local->scan_flags 



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

Signed-off-by: default avatarHelmut Schaa <hschaa@suse.de>
Signed-off-by: default avatarJiri Benc <jbenc@suse.cz>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dabeb344

net/mac80211/ieee80211_i.h

+0 −4
Original line number Diff line number Diff line
@@ -483,10 +483,6 @@ struct ieee80211_local { 
	struct list_head sta_bss_list;

	struct ieee80211_sta_bss *sta_bss_hash[STA_HASH_SIZE];

	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 */

	/* dot11CountersTable */

net/mac80211/ieee80211_ioctl.c

+3 −16
Original line number Diff line number Diff line
@@ -513,7 +513,6 @@ static int ieee80211_ioctl_siwscan(struct net_device *dev, 
				   struct iw_request_info *info,

				   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 iw_scan_req *req = NULL;

	u8 *ssid = NULL;
@@ -522,21 +521,9 @@ static int ieee80211_ioctl_siwscan(struct net_device *dev, 
	if (!netif_running(dev))

		return -ENETDOWN;



	switch (sdata->type) {

	case IEEE80211_IF_TYPE_STA:

	case IEEE80211_IF_TYPE_IBSS:

		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:

	if (sdata->type != IEEE80211_IF_TYPE_STA &&

	    sdata->type != IEEE80211_IF_TYPE_IBSS &&

	    sdata->type != IEEE80211_IF_TYPE_AP) {

		return -EOPNOTSUPP;

	}

net/mac80211/ieee80211_sta.c

+0 −12
Original line number Diff line number Diff line
@@ -2894,15 +2894,6 @@ ieee80211_sta_scan_result(struct net_device *dev, 
	if (!(local->enabled_modes & (1 << bss->hw_mode)))

		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));

	iwe.cmd = SIOCGIWAP;

	iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
@@ -3009,9 +3000,6 @@ ieee80211_sta_scan_result(struct net_device *dev, 
	do {

		char *buf;



		if (!(local->scan_flags & IEEE80211_SCAN_EXTRA_INFO))

			break;



		buf = kmalloc(100, GFP_ATOMIC);

		if (!buf)

			break;