Skip to content

L
linux
Commit c2b13452 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files
Options

mac80211: clean up scan namespace 

Most of the scan functions are called ieee80211_sta_scan_*
or similar, make clean it up so they are all just called
ieee80211_scan_*.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 213cd118
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 140 deletions
net/mac80211/ieee80211_i.h
View file @ c2b13452
...@@ -71,9 +71,9 @@ struct ieee80211_fragment_entry { ...@@ -71,9 +71,9 @@ struct ieee80211_fragment_entry {
}; };
struct ieee80211_sta_bss { struct ieee80211_bss {
struct list_head list; struct list_head list;
struct ieee80211_sta_bss *hnext; struct ieee80211_bss *hnext;
size_t ssid_len; size_t ssid_len;
atomic_t users; atomic_t users;
...@@ -112,7 +112,7 @@ struct ieee80211_sta_bss { ...@@ -112,7 +112,7 @@ struct ieee80211_sta_bss {
u8 erp_value; u8 erp_value;
}; };
static inline u8 *bss_mesh_cfg(struct ieee80211_sta_bss *bss) static inline u8 *bss_mesh_cfg(struct ieee80211_bss *bss)
{ {
#ifdef CONFIG_MAC80211_MESH #ifdef CONFIG_MAC80211_MESH
return bss->mesh_cfg; return bss->mesh_cfg;
...@@ -120,7 +120,7 @@ static inline u8 *bss_mesh_cfg(struct ieee80211_sta_bss *bss) ...@@ -120,7 +120,7 @@ static inline u8 *bss_mesh_cfg(struct ieee80211_sta_bss *bss)
return NULL; return NULL;
} }
static inline u8 *bss_mesh_id(struct ieee80211_sta_bss *bss) static inline u8 *bss_mesh_id(struct ieee80211_bss *bss)
{ {
#ifdef CONFIG_MAC80211_MESH #ifdef CONFIG_MAC80211_MESH
return bss->mesh_id; return bss->mesh_id;
...@@ -128,7 +128,7 @@ static inline u8 *bss_mesh_id(struct ieee80211_sta_bss *bss) ...@@ -128,7 +128,7 @@ static inline u8 *bss_mesh_id(struct ieee80211_sta_bss *bss)
return NULL; return NULL;
} }
static inline u8 bss_mesh_id_len(struct ieee80211_sta_bss *bss) static inline u8 bss_mesh_id_len(struct ieee80211_bss *bss)
{ {
#ifdef CONFIG_MAC80211_MESH #ifdef CONFIG_MAC80211_MESH
return bss->mesh_id_len; return bss->mesh_id_len;
...@@ -658,8 +658,8 @@ struct ieee80211_local { ...@@ -658,8 +658,8 @@ struct ieee80211_local {
spinlock_t key_lock; spinlock_t key_lock;
bool sta_sw_scanning; /* Scanning and BSS list */
bool sta_hw_scanning; bool sw_scanning, hw_scanning;
int scan_channel_idx; int scan_channel_idx;
enum ieee80211_band scan_band; enum ieee80211_band scan_band;
...@@ -670,9 +670,9 @@ struct ieee80211_local { ...@@ -670,9 +670,9 @@ struct ieee80211_local {
struct ieee80211_channel *oper_channel, *scan_channel; struct ieee80211_channel *oper_channel, *scan_channel;
u8 scan_ssid[IEEE80211_MAX_SSID_LEN]; u8 scan_ssid[IEEE80211_MAX_SSID_LEN];
size_t scan_ssid_len; size_t scan_ssid_len;
struct list_head sta_bss_list; struct list_head bss_list;
struct ieee80211_sta_bss *sta_bss_hash[STA_HASH_SIZE]; struct ieee80211_bss *bss_hash[STA_HASH_SIZE];
spinlock_t sta_bss_lock; spinlock_t bss_lock;
/* SNMP counters */ /* SNMP counters */
/* dot11CountersTable */ /* dot11CountersTable */
...@@ -905,7 +905,7 @@ extern const struct iw_handler_def ieee80211_iw_handler_def; ...@@ -905,7 +905,7 @@ extern const struct iw_handler_def ieee80211_iw_handler_def;
/* STA/IBSS code */ /* STA/IBSS code */
void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata); void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata);
void ieee80211_sta_scan_work(struct work_struct *work); void ieee80211_scan_work(struct work_struct *work);
void ieee80211_sta_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb, void ieee80211_sta_rx_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb,
struct ieee80211_rx_status *rx_status); struct ieee80211_rx_status *rx_status);
int ieee80211_sta_set_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t len); int ieee80211_sta_set_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t len);
...@@ -926,35 +926,38 @@ void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst, ...@@ -926,35 +926,38 @@ void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst,
u8 *ssid, size_t ssid_len); u8 *ssid, size_t ssid_len);
/* scan/BSS handling */ /* scan/BSS handling */
int ieee80211_sta_req_scan(struct ieee80211_sub_if_data *sdata, u8 *ssid, size_t ssid_len); int ieee80211_request_scan(struct ieee80211_sub_if_data *sdata,
int ieee80211_sta_scan_results(struct ieee80211_local *local, u8 *ssid, size_t ssid_len);
struct iw_request_info *info, int ieee80211_scan_results(struct ieee80211_local *local,
char *buf, size_t len); struct iw_request_info *info,
ieee80211_rx_result ieee80211_sta_rx_scan( char *buf, size_t len);
struct ieee80211_sub_if_data *sdata, struct sk_buff *skb, ieee80211_rx_result
struct ieee80211_rx_status *rx_status); ieee80211_scan_rx(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb,
struct ieee80211_rx_status *rx_status);
void ieee80211_rx_bss_list_init(struct ieee80211_local *local); void ieee80211_rx_bss_list_init(struct ieee80211_local *local);
void ieee80211_rx_bss_list_deinit(struct ieee80211_local *local); void ieee80211_rx_bss_list_deinit(struct ieee80211_local *local);
int ieee80211_sta_set_extra_ie(struct ieee80211_sub_if_data *sdata, char *ie, size_t len); int ieee80211_sta_set_extra_ie(struct ieee80211_sub_if_data *sdata,
char *ie, size_t len);
void ieee80211_mlme_notify_scan_completed(struct ieee80211_local *local); void ieee80211_mlme_notify_scan_completed(struct ieee80211_local *local);
int ieee80211_sta_start_scan(struct ieee80211_sub_if_data *scan_sdata, int ieee80211_start_scan(struct ieee80211_sub_if_data *scan_sdata,
u8 *ssid, size_t ssid_len); u8 *ssid, size_t ssid_len);
struct ieee80211_sta_bss * struct ieee80211_bss *
ieee80211_bss_info_update(struct ieee80211_local *local, ieee80211_bss_info_update(struct ieee80211_local *local,
struct ieee80211_rx_status *rx_status, struct ieee80211_rx_status *rx_status,
struct ieee80211_mgmt *mgmt, struct ieee80211_mgmt *mgmt,
size_t len, size_t len,
struct ieee802_11_elems *elems, struct ieee802_11_elems *elems,
int freq, bool beacon); int freq, bool beacon);
struct ieee80211_sta_bss * struct ieee80211_bss *
ieee80211_rx_bss_add(struct ieee80211_local *local, u8 *bssid, int freq, ieee80211_rx_bss_add(struct ieee80211_local *local, u8 *bssid, int freq,
u8 *ssid, u8 ssid_len); u8 *ssid, u8 ssid_len);
struct ieee80211_sta_bss * struct ieee80211_bss *
ieee80211_rx_bss_get(struct ieee80211_local *local, u8 *bssid, int freq, ieee80211_rx_bss_get(struct ieee80211_local *local, u8 *bssid, int freq,
u8 *ssid, u8 ssid_len); u8 *ssid, u8 ssid_len);
void ieee80211_rx_bss_put(struct ieee80211_local *local, void ieee80211_rx_bss_put(struct ieee80211_local *local,
struct ieee80211_sta_bss *bss); struct ieee80211_bss *bss);
/* interface handling */ /* interface handling */
void ieee80211_if_setup(struct net_device *dev); void ieee80211_if_setup(struct net_device *dev);
......
net/mac80211/main.c
View file @ c2b13452
...@@ -598,7 +598,7 @@ static int ieee80211_stop(struct net_device *dev) ...@@ -598,7 +598,7 @@ static int ieee80211_stop(struct net_device *dev)
* the scan_sdata is NULL already don't send out a * the scan_sdata is NULL already don't send out a
* scan event to userspace -- the scan is incomplete. * scan event to userspace -- the scan is incomplete.
*/ */
if (local->sta_sw_scanning) if (local->sw_scanning)
ieee80211_scan_completed(&local->hw); ieee80211_scan_completed(&local->hw);
} }
...@@ -732,7 +732,7 @@ int ieee80211_hw_config(struct ieee80211_local *local) ...@@ -732,7 +732,7 @@ int ieee80211_hw_config(struct ieee80211_local *local)
struct ieee80211_channel *chan; struct ieee80211_channel *chan;
int ret = 0; int ret = 0;
if (local->sta_sw_scanning) if (local->sw_scanning)
chan = local->scan_channel; chan = local->scan_channel;
else else
chan = local->oper_channel; chan = local->oper_channel;
...@@ -1290,7 +1290,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, ...@@ -1290,7 +1290,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
spin_lock_init(&local->key_lock); spin_lock_init(&local->key_lock);
INIT_DELAYED_WORK(&local->scan_work, ieee80211_sta_scan_work); INIT_DELAYED_WORK(&local->scan_work, ieee80211_scan_work);
sta_info_init(local); sta_info_init(local);
......
net/mac80211/mesh.c
View file @ c2b13452
...@@ -566,7 +566,7 @@ static void ieee80211_mesh_work(struct work_struct *work) ...@@ -566,7 +566,7 @@ static void ieee80211_mesh_work(struct work_struct *work)
if (!netif_running(sdata->dev)) if (!netif_running(sdata->dev))
return; return;
if (local->sta_sw_scanning || local->sta_hw_scanning) if (local->sw_scanning || local->hw_scanning)
return; return;
while ((skb = skb_dequeue(&ifmsh->skb_queue))) while ((skb = skb_dequeue(&ifmsh->skb_queue)))
......
net/mac80211/mlme.c
View file @ c2b13452
...@@ -52,7 +52,7 @@ static int ecw2cw(int ecw) ...@@ -52,7 +52,7 @@ static int ecw2cw(int ecw)
return (1 << ecw) - 1; return (1 << ecw) - 1;
} }
static u8 *ieee80211_bss_get_ie(struct ieee80211_sta_bss *bss, u8 ie) static u8 *ieee80211_bss_get_ie(struct ieee80211_bss *bss, u8 ie)
{ {
u8 *end, *pos; u8 *end, *pos;
...@@ -72,7 +72,7 @@ static u8 *ieee80211_bss_get_ie(struct ieee80211_sta_bss *bss, u8 ie) ...@@ -72,7 +72,7 @@ static u8 *ieee80211_bss_get_ie(struct ieee80211_sta_bss *bss, u8 ie)
return NULL; return NULL;
} }
static int ieee80211_compatible_rates(struct ieee80211_sta_bss *bss, static int ieee80211_compatible_rates(struct ieee80211_bss *bss,
struct ieee80211_supported_band *sband, struct ieee80211_supported_band *sband,
u64 *rates) u64 *rates)
{ {
...@@ -239,7 +239,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata, ...@@ -239,7 +239,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata,
u8 *pos, *ies, *ht_add_ie; u8 *pos, *ies, *ht_add_ie;
int i, len, count, rates_len, supp_rates_len; int i, len, count, rates_len, supp_rates_len;
u16 capab; u16 capab;
struct ieee80211_sta_bss *bss; struct ieee80211_bss *bss;
int wmm = 0; int wmm = 0;
struct ieee80211_supported_band *sband; struct ieee80211_supported_band *sband;
u64 rates = 0; u64 rates = 0;
...@@ -470,7 +470,7 @@ static void ieee80211_send_deauth_disassoc(struct ieee80211_sub_if_data *sdata, ...@@ -470,7 +470,7 @@ static void ieee80211_send_deauth_disassoc(struct ieee80211_sub_if_data *sdata,
/* MLME */ /* MLME */
static void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata, static void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata,
struct ieee80211_sta_bss *bss) struct ieee80211_bss *bss)
{ {
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
int i, have_higher_than_11mbit = 0; int i, have_higher_than_11mbit = 0;
...@@ -621,7 +621,7 @@ static u32 ieee80211_handle_erp_ie(struct ieee80211_sub_if_data *sdata, ...@@ -621,7 +621,7 @@ static u32 ieee80211_handle_erp_ie(struct ieee80211_sub_if_data *sdata,
} }
static u32 ieee80211_handle_bss_capability(struct ieee80211_sub_if_data *sdata, static u32 ieee80211_handle_bss_capability(struct ieee80211_sub_if_data *sdata,
struct ieee80211_sta_bss *bss) struct ieee80211_bss *bss)
{ {
u32 changed = 0; u32 changed = 0;
...@@ -674,7 +674,7 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata, ...@@ -674,7 +674,7 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
struct ieee80211_conf *conf = &local_to_hw(local)->conf; struct ieee80211_conf *conf = &local_to_hw(local)->conf;
u32 changed = BSS_CHANGED_ASSOC; u32 changed = BSS_CHANGED_ASSOC;
struct ieee80211_sta_bss *bss; struct ieee80211_bss *bss;
ifsta->flags |= IEEE80211_STA_ASSOCIATED; ifsta->flags |= IEEE80211_STA_ASSOCIATED;
...@@ -846,7 +846,7 @@ static int ieee80211_privacy_mismatch(struct ieee80211_sub_if_data *sdata, ...@@ -846,7 +846,7 @@ static int ieee80211_privacy_mismatch(struct ieee80211_sub_if_data *sdata,
struct ieee80211_if_sta *ifsta) struct ieee80211_if_sta *ifsta)
{ {
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
struct ieee80211_sta_bss *bss; struct ieee80211_bss *bss;
int bss_privacy; int bss_privacy;
int wep_privacy; int wep_privacy;
int privacy_invoked; int privacy_invoked;
...@@ -1219,7 +1219,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, ...@@ -1219,7 +1219,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
/* Add STA entry for the AP */ /* Add STA entry for the AP */
sta = sta_info_get(local, ifsta->bssid); sta = sta_info_get(local, ifsta->bssid);
if (!sta) { if (!sta) {
struct ieee80211_sta_bss *bss; struct ieee80211_bss *bss;
int err; int err;
sta = sta_info_alloc(sdata, ifsta->bssid, GFP_ATOMIC); sta = sta_info_alloc(sdata, ifsta->bssid, GFP_ATOMIC);
...@@ -1339,7 +1339,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, ...@@ -1339,7 +1339,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
static int ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, static int ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
struct ieee80211_if_sta *ifsta, struct ieee80211_if_sta *ifsta,
struct ieee80211_sta_bss *bss) struct ieee80211_bss *bss)
{ {
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
int res, rates, i, j; int res, rates, i, j;
...@@ -1490,7 +1490,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, ...@@ -1490,7 +1490,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
{ {
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
int freq; int freq;
struct ieee80211_sta_bss *bss; struct ieee80211_bss *bss;
struct sta_info *sta; struct sta_info *sta;
struct ieee80211_channel *channel; struct ieee80211_channel *channel;
u64 beacon_timestamp, rx_timestamp; u64 beacon_timestamp, rx_timestamp;
...@@ -1893,7 +1893,7 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata, ...@@ -1893,7 +1893,7 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata,
printk(KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other " printk(KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other "
"IBSS networks with same SSID (merge)\n", sdata->dev->name); "IBSS networks with same SSID (merge)\n", sdata->dev->name);
ieee80211_sta_req_scan(sdata, ifsta->ssid, ifsta->ssid_len); ieee80211_request_scan(sdata, ifsta->ssid, ifsta->ssid_len);
} }
...@@ -1974,7 +1974,7 @@ static int ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata, ...@@ -1974,7 +1974,7 @@ static int ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata,
struct ieee80211_if_sta *ifsta) struct ieee80211_if_sta *ifsta)
{ {
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
struct ieee80211_sta_bss *bss; struct ieee80211_bss *bss;
struct ieee80211_supported_band *sband; struct ieee80211_supported_band *sband;
u8 bssid[ETH_ALEN], *pos; u8 bssid[ETH_ALEN], *pos;
int i; int i;
...@@ -2035,7 +2035,7 @@ static int ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata, ...@@ -2035,7 +2035,7 @@ static int ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata,
struct ieee80211_if_sta *ifsta) struct ieee80211_if_sta *ifsta)
{ {
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
struct ieee80211_sta_bss *bss; struct ieee80211_bss *bss;
int found = 0; int found = 0;
u8 bssid[ETH_ALEN]; u8 bssid[ETH_ALEN];
int active_ibss; int active_ibss;
...@@ -2050,8 +2050,8 @@ static int ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata, ...@@ -2050,8 +2050,8 @@ static int ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata,
printk(KERN_DEBUG "%s: sta_find_ibss (active_ibss=%d)\n", printk(KERN_DEBUG "%s: sta_find_ibss (active_ibss=%d)\n",
sdata->dev->name, active_ibss); sdata->dev->name, active_ibss);
#endif /* CONFIG_MAC80211_IBSS_DEBUG */ #endif /* CONFIG_MAC80211_IBSS_DEBUG */
spin_lock_bh(&local->sta_bss_lock); spin_lock_bh(&local->bss_lock);
list_for_each_entry(bss, &local->sta_bss_list, list) { list_for_each_entry(bss, &local->bss_list, list) {
if (ifsta->ssid_len != bss->ssid_len || if (ifsta->ssid_len != bss->ssid_len ||
memcmp(ifsta->ssid, bss->ssid, bss->ssid_len) != 0 memcmp(ifsta->ssid, bss->ssid, bss->ssid_len) != 0
|| !(bss->capability & WLAN_CAPABILITY_IBSS)) || !(bss->capability & WLAN_CAPABILITY_IBSS))
...@@ -2065,7 +2065,7 @@ static int ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata, ...@@ -2065,7 +2065,7 @@ static int ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata,
if (active_ibss || memcmp(bssid, ifsta->bssid, ETH_ALEN) != 0) if (active_ibss || memcmp(bssid, ifsta->bssid, ETH_ALEN) != 0)
break; break;
} }
spin_unlock_bh(&local->sta_bss_lock); spin_unlock_bh(&local->bss_lock);
#ifdef CONFIG_MAC80211_IBSS_DEBUG #ifdef CONFIG_MAC80211_IBSS_DEBUG
if (found) if (found)
...@@ -2110,7 +2110,7 @@ static int ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata, ...@@ -2110,7 +2110,7 @@ static int ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata,
IEEE80211_SCAN_INTERVAL)) { IEEE80211_SCAN_INTERVAL)) {
printk(KERN_DEBUG "%s: Trigger new scan to find an IBSS to " printk(KERN_DEBUG "%s: Trigger new scan to find an IBSS to "
"join\n", sdata->dev->name); "join\n", sdata->dev->name);
return ieee80211_sta_req_scan(sdata, ifsta->ssid, return ieee80211_request_scan(sdata, ifsta->ssid,
ifsta->ssid_len); ifsta->ssid_len);
} else if (ifsta->state != IEEE80211_STA_MLME_IBSS_JOINED) { } else if (ifsta->state != IEEE80211_STA_MLME_IBSS_JOINED) {
int interval = IEEE80211_SCAN_INTERVAL; int interval = IEEE80211_SCAN_INTERVAL;
...@@ -2145,12 +2145,12 @@ static int ieee80211_sta_config_auth(struct ieee80211_sub_if_data *sdata, ...@@ -2145,12 +2145,12 @@ static int ieee80211_sta_config_auth(struct ieee80211_sub_if_data *sdata,
struct ieee80211_if_sta *ifsta) struct ieee80211_if_sta *ifsta)
{ {
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
struct ieee80211_sta_bss *bss, *selected = NULL; struct ieee80211_bss *bss, *selected = NULL;
int top_rssi = 0, freq; int top_rssi = 0, freq;
spin_lock_bh(&local->sta_bss_lock); spin_lock_bh(&local->bss_lock);
freq = local->oper_channel->center_freq; freq = local->oper_channel->center_freq;
list_for_each_entry(bss, &local->sta_bss_list, list) { list_for_each_entry(bss, &local->bss_list, list) {
if (!(bss->capability & WLAN_CAPABILITY_ESS)) if (!(bss->capability & WLAN_CAPABILITY_ESS))
continue; continue;
...@@ -2180,7 +2180,7 @@ static int ieee80211_sta_config_auth(struct ieee80211_sub_if_data *sdata, ...@@ -2180,7 +2180,7 @@ static int ieee80211_sta_config_auth(struct ieee80211_sub_if_data *sdata,
} }
if (selected) if (selected)
atomic_inc(&selected->users); atomic_inc(&selected->users);
spin_unlock_bh(&local->sta_bss_lock); spin_unlock_bh(&local->bss_lock);
if (selected) { if (selected) {
ieee80211_set_freq(sdata, selected->freq); ieee80211_set_freq(sdata, selected->freq);
...@@ -2207,9 +2207,9 @@ static int ieee80211_sta_config_auth(struct ieee80211_sub_if_data *sdata, ...@@ -2207,9 +2207,9 @@ static int ieee80211_sta_config_auth(struct ieee80211_sub_if_data *sdata,
if (ifsta->assoc_scan_tries < IEEE80211_ASSOC_SCANS_MAX_TRIES) { if (ifsta->assoc_scan_tries < IEEE80211_ASSOC_SCANS_MAX_TRIES) {
ifsta->assoc_scan_tries++; ifsta->assoc_scan_tries++;
if (ifsta->flags & IEEE80211_STA_AUTO_SSID_SEL) if (ifsta->flags & IEEE80211_STA_AUTO_SSID_SEL)
ieee80211_sta_start_scan(sdata, NULL, 0); ieee80211_start_scan(sdata, NULL, 0);
else else
ieee80211_sta_start_scan(sdata, ifsta->ssid, ieee80211_start_scan(sdata, ifsta->ssid,
ifsta->ssid_len); ifsta->ssid_len);
ifsta->state = IEEE80211_STA_MLME_AUTHENTICATE; ifsta->state = IEEE80211_STA_MLME_AUTHENTICATE;
set_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request); set_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request);
...@@ -2231,7 +2231,7 @@ static void ieee80211_sta_work(struct work_struct *work) ...@@ -2231,7 +2231,7 @@ static void ieee80211_sta_work(struct work_struct *work)
if (!netif_running(sdata->dev)) if (!netif_running(sdata->dev))
return; return;
if (local->sta_sw_scanning || local->sta_hw_scanning) if (local->sw_scanning || local->hw_scanning)
return; return;
if (WARN_ON(sdata->vif.type != IEEE80211_IF_TYPE_STA && if (WARN_ON(sdata->vif.type != IEEE80211_IF_TYPE_STA &&
...@@ -2246,7 +2246,8 @@ static void ieee80211_sta_work(struct work_struct *work) ...@@ -2246,7 +2246,8 @@ static void ieee80211_sta_work(struct work_struct *work)
ifsta->state != IEEE80211_STA_MLME_AUTHENTICATE && ifsta->state != IEEE80211_STA_MLME_AUTHENTICATE &&
ifsta->state != IEEE80211_STA_MLME_ASSOCIATE && ifsta->state != IEEE80211_STA_MLME_ASSOCIATE &&
test_and_clear_bit(IEEE80211_STA_REQ_SCAN, &ifsta->request)) { test_and_clear_bit(IEEE80211_STA_REQ_SCAN, &ifsta->request)) {
ieee80211_sta_start_scan(sdata, ifsta->scan_ssid, ifsta->scan_ssid_len); ieee80211_start_scan(sdata, ifsta->scan_ssid,
ifsta->scan_ssid_len);
return; return;
} }
......
net/mac80211/rx.c
View file @ c2b13452
...@@ -403,12 +403,12 @@ ieee80211_rx_h_passive_scan(struct ieee80211_rx_data *rx) ...@@ -403,12 +403,12 @@ ieee80211_rx_h_passive_scan(struct ieee80211_rx_data *rx)
struct ieee80211_local *local = rx->local; struct ieee80211_local *local = rx->local;
struct sk_buff *skb = rx->skb; struct sk_buff *skb = rx->skb;
if (unlikely(local->sta_hw_scanning)) if (unlikely(local->hw_scanning))
return ieee80211_sta_rx_scan(rx->sdata, skb, rx->status); return ieee80211_scan_rx(rx->sdata, skb, rx->status);
if (unlikely(local->sta_sw_scanning)) { if (unlikely(local->sw_scanning)) {
/* drop all the other packets during a software scan anyway */ /* drop all the other packets during a software scan anyway */
if (ieee80211_sta_rx_scan(rx->sdata, skb, rx->status) if (ieee80211_scan_rx(rx->sdata, skb, rx->status)
!= RX_QUEUED) != RX_QUEUED)
dev_kfree_skb(skb); dev_kfree_skb(skb);
return RX_QUEUED; return RX_QUEUED;
...@@ -1918,7 +1918,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, ...@@ -1918,7 +1918,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
return; return;
} }
if (unlikely(local->sta_sw_scanning || local->sta_hw_scanning)) if (unlikely(local->sw_scanning || local->hw_scanning))
rx.flags |= IEEE80211_RX_IN_SCAN; rx.flags |= IEEE80211_RX_IN_SCAN;
ieee80211_parse_qos(&rx); ieee80211_parse_qos(&rx);
......
net/mac80211/scan.c
View file @ c2b13452
...@@ -32,26 +32,26 @@ ...@@ -32,26 +32,26 @@
void ieee80211_rx_bss_list_init(struct ieee80211_local *local) void ieee80211_rx_bss_list_init(struct ieee80211_local *local)
{ {
spin_lock_init(&local->sta_bss_lock); spin_lock_init(&local->bss_lock);
INIT_LIST_HEAD(&local->sta_bss_list); INIT_LIST_HEAD(&local->bss_list);
} }
void ieee80211_rx_bss_list_deinit(struct ieee80211_local *local) void ieee80211_rx_bss_list_deinit(struct ieee80211_local *local)
{ {
struct ieee80211_sta_bss *bss, *tmp; struct ieee80211_bss *bss, *tmp;
list_for_each_entry_safe(bss, tmp, &local->sta_bss_list, list) list_for_each_entry_safe(bss, tmp, &local->bss_list, list)
ieee80211_rx_bss_put(local, bss); ieee80211_rx_bss_put(local, bss);
} }
struct ieee80211_sta_bss * struct ieee80211_bss *
ieee80211_rx_bss_get(struct ieee80211_local *local, u8 *bssid, int freq, ieee80211_rx_bss_get(struct ieee80211_local *local, u8 *bssid, int freq,
u8 *ssid, u8 ssid_len) u8 *ssid, u8 ssid_len)
{ {
struct ieee80211_sta_bss *bss; struct ieee80211_bss *bss;
spin_lock_bh(&local->sta_bss_lock); spin_lock_bh(&local->bss_lock);
bss = local->sta_bss_hash[STA_HASH(bssid)]; bss = local->bss_hash[STA_HASH(bssid)];
while (bss) { while (bss) {
if (!bss_mesh_cfg(bss) && if (!bss_mesh_cfg(bss) &&
!memcmp(bss->bssid, bssid, ETH_ALEN) && !memcmp(bss->bssid, bssid, ETH_ALEN) &&
...@@ -63,13 +63,13 @@ ieee80211_rx_bss_get(struct ieee80211_local *local, u8 *bssid, int freq, ...@@ -63,13 +63,13 @@ ieee80211_rx_bss_get(struct ieee80211_local *local, u8 *bssid, int freq,
} }
bss = bss->hnext; bss = bss->hnext;
} }
spin_unlock_bh(&local->sta_bss_lock); spin_unlock_bh(&local->bss_lock);
return bss; return bss;
} }
/* Caller must hold local->sta_bss_lock */ /* Caller must hold local->bss_lock */
static void __ieee80211_rx_bss_hash_add(struct ieee80211_local *local, static void __ieee80211_rx_bss_hash_add(struct ieee80211_local *local,
struct ieee80211_sta_bss *bss) struct ieee80211_bss *bss)
{ {
u8 hash_idx; u8 hash_idx;
...@@ -79,20 +79,20 @@ static void __ieee80211_rx_bss_hash_add(struct ieee80211_local *local, ...@@ -79,20 +79,20 @@ static void __ieee80211_rx_bss_hash_add(struct ieee80211_local *local,
else else
hash_idx = STA_HASH(bss->bssid); hash_idx = STA_HASH(bss->bssid);
bss->hnext = local->sta_bss_hash[hash_idx]; bss->hnext = local->bss_hash[hash_idx];
local->sta_bss_hash[hash_idx] = bss; local->bss_hash[hash_idx] = bss;
} }
/* Caller must hold local->sta_bss_lock */ /* Caller must hold local->bss_lock */
static void __ieee80211_rx_bss_hash_del(struct ieee80211_local *local, static void __ieee80211_rx_bss_hash_del(struct ieee80211_local *local,
struct ieee80211_sta_bss *bss) struct ieee80211_bss *bss)
{ {
struct ieee80211_sta_bss *b, *prev = NULL; struct ieee80211_bss *b, *prev = NULL;
b = local->sta_bss_hash[STA_HASH(bss->bssid)]; b = local->bss_hash[STA_HASH(bss->bssid)];
while (b) { while (b) {
if (b == bss) { if (b == bss) {
if (!prev) if (!prev)
local->sta_bss_hash[STA_HASH(bss->bssid)] = local->bss_hash[STA_HASH(bss->bssid)] =
bss->hnext; bss->hnext;
else else
prev->hnext = bss->hnext; prev->hnext = bss->hnext;
...@@ -103,11 +103,11 @@ static void __ieee80211_rx_bss_hash_del(struct ieee80211_local *local, ...@@ -103,11 +103,11 @@ static void __ieee80211_rx_bss_hash_del(struct ieee80211_local *local,
} }
} }
struct ieee80211_sta_bss * struct ieee80211_bss *
ieee80211_rx_bss_add(struct ieee80211_local *local, u8 *bssid, int freq, ieee80211_rx_bss_add(struct ieee80211_local *local, u8 *bssid, int freq,
u8 *ssid, u8 ssid_len) u8 *ssid, u8 ssid_len)
{ {
struct ieee80211_sta_bss *bss; struct ieee80211_bss *bss;
bss = kzalloc(sizeof(*bss), GFP_ATOMIC); bss = kzalloc(sizeof(*bss), GFP_ATOMIC);
if (!bss) if (!bss)
...@@ -120,23 +120,23 @@ ieee80211_rx_bss_add(struct ieee80211_local *local, u8 *bssid, int freq, ...@@ -120,23 +120,23 @@ ieee80211_rx_bss_add(struct ieee80211_local *local, u8 *bssid, int freq,
bss->ssid_len = ssid_len; bss->ssid_len = ssid_len;
} }
spin_lock_bh(&local->sta_bss_lock); spin_lock_bh(&local->bss_lock);
/* TODO: order by RSSI? */ /* TODO: order by RSSI? */
list_add_tail(&bss->list, &local->sta_bss_list); list_add_tail(&bss->list, &local->bss_list);
__ieee80211_rx_bss_hash_add(local, bss); __ieee80211_rx_bss_hash_add(local, bss);
spin_unlock_bh(&local->sta_bss_lock); spin_unlock_bh(&local->bss_lock);
return bss; return bss;
} }
#ifdef CONFIG_MAC80211_MESH #ifdef CONFIG_MAC80211_MESH
static struct ieee80211_sta_bss * static struct ieee80211_bss *
ieee80211_rx_mesh_bss_get(struct ieee80211_local *local, u8 *mesh_id, int mesh_id_len, ieee80211_rx_mesh_bss_get(struct ieee80211_local *local, u8 *mesh_id, int mesh_id_len,
u8 *mesh_cfg, int freq) u8 *mesh_cfg, int freq)
{ {
struct ieee80211_sta_bss *bss; struct ieee80211_bss *bss;
spin_lock_bh(&local->sta_bss_lock); spin_lock_bh(&local->bss_lock);
bss = local->sta_bss_hash[mesh_id_hash(mesh_id, mesh_id_len)]; bss = local->bss_hash[mesh_id_hash(mesh_id, mesh_id_len)];
while (bss) { while (bss) {
if (bss_mesh_cfg(bss) && if (bss_mesh_cfg(bss) &&
!memcmp(bss_mesh_cfg(bss), mesh_cfg, MESH_CFG_CMP_LEN) && !memcmp(bss_mesh_cfg(bss), mesh_cfg, MESH_CFG_CMP_LEN) &&
...@@ -149,15 +149,15 @@ ieee80211_rx_mesh_bss_get(struct ieee80211_local *local, u8 *mesh_id, int mesh_i ...@@ -149,15 +149,15 @@ ieee80211_rx_mesh_bss_get(struct ieee80211_local *local, u8 *mesh_id, int mesh_i
} }
bss = bss->hnext; bss = bss->hnext;
} }
spin_unlock_bh(&local->sta_bss_lock); spin_unlock_bh(&local->bss_lock);
return bss; return bss;
} }
static struct ieee80211_sta_bss * static struct ieee80211_bss *
ieee80211_rx_mesh_bss_add(struct ieee80211_local *local, u8 *mesh_id, int mesh_id_len, ieee80211_rx_mesh_bss_add(struct ieee80211_local *local, u8 *mesh_id, int mesh_id_len,
u8 *mesh_cfg, int mesh_config_len, int freq) u8 *mesh_cfg, int mesh_config_len, int freq)
{ {
struct ieee80211_sta_bss *bss; struct ieee80211_bss *bss;
if (mesh_config_len != MESH_CFG_LEN) if (mesh_config_len != MESH_CFG_LEN)
return NULL; return NULL;
...@@ -186,16 +186,16 @@ ieee80211_rx_mesh_bss_add(struct ieee80211_local *local, u8 *mesh_id, int mesh_i ...@@ -186,16 +186,16 @@ ieee80211_rx_mesh_bss_add(struct ieee80211_local *local, u8 *mesh_id, int mesh_i
memcpy(bss->mesh_cfg, mesh_cfg, MESH_CFG_CMP_LEN); memcpy(bss->mesh_cfg, mesh_cfg, MESH_CFG_CMP_LEN);
bss->mesh_id_len = mesh_id_len; bss->mesh_id_len = mesh_id_len;
bss->freq = freq; bss->freq = freq;
spin_lock_bh(&local->sta_bss_lock); spin_lock_bh(&local->bss_lock);
/* TODO: order by RSSI? */ /* TODO: order by RSSI? */
list_add_tail(&bss->list, &local->sta_bss_list); list_add_tail(&bss->list, &local->bss_list);
__ieee80211_rx_bss_hash_add(local, bss); __ieee80211_rx_bss_hash_add(local, bss);
spin_unlock_bh(&local->sta_bss_lock); spin_unlock_bh(&local->bss_lock);
return bss; return bss;
} }
#endif #endif
static void ieee80211_rx_bss_free(struct ieee80211_sta_bss *bss) static void ieee80211_rx_bss_free(struct ieee80211_bss *bss)
{ {
kfree(bss->ies); kfree(bss->ies);
kfree(bss_mesh_id(bss)); kfree(bss_mesh_id(bss));
...@@ -204,21 +204,21 @@ static void ieee80211_rx_bss_free(struct ieee80211_sta_bss *bss) ...@@ -204,21 +204,21 @@ static void ieee80211_rx_bss_free(struct ieee80211_sta_bss *bss)
} }
void ieee80211_rx_bss_put(struct ieee80211_local *local, void ieee80211_rx_bss_put(struct ieee80211_local *local,
struct ieee80211_sta_bss *bss) struct ieee80211_bss *bss)
{ {
local_bh_disable(); local_bh_disable();
if (!atomic_dec_and_lock(&bss->users, &local->sta_bss_lock)) { if (!atomic_dec_and_lock(&bss->users, &local->bss_lock)) {
local_bh_enable(); local_bh_enable();
return; return;
} }
__ieee80211_rx_bss_hash_del(local, bss); __ieee80211_rx_bss_hash_del(local, bss);
list_del(&bss->list); list_del(&bss->list);
spin_unlock_bh(&local->sta_bss_lock); spin_unlock_bh(&local->bss_lock);
ieee80211_rx_bss_free(bss); ieee80211_rx_bss_free(bss);
} }
struct ieee80211_sta_bss * struct ieee80211_bss *
ieee80211_bss_info_update(struct ieee80211_local *local, ieee80211_bss_info_update(struct ieee80211_local *local,
struct ieee80211_rx_status *rx_status, struct ieee80211_rx_status *rx_status,
struct ieee80211_mgmt *mgmt, struct ieee80211_mgmt *mgmt,
...@@ -226,7 +226,7 @@ ieee80211_bss_info_update(struct ieee80211_local *local, ...@@ -226,7 +226,7 @@ ieee80211_bss_info_update(struct ieee80211_local *local,
struct ieee802_11_elems *elems, struct ieee802_11_elems *elems,
int freq, bool beacon) int freq, bool beacon)
{ {
struct ieee80211_sta_bss *bss; struct ieee80211_bss *bss;
int clen; int clen;
#ifdef CONFIG_MAC80211_MESH #ifdef CONFIG_MAC80211_MESH
...@@ -252,9 +252,9 @@ ieee80211_bss_info_update(struct ieee80211_local *local, ...@@ -252,9 +252,9 @@ ieee80211_bss_info_update(struct ieee80211_local *local,
} else { } else {
#if 0 #if 0
/* TODO: order by RSSI? */ /* TODO: order by RSSI? */
spin_lock_bh(&local->sta_bss_lock); spin_lock_bh(&local->bss_lock);
list_move_tail(&bss->list, &local->sta_bss_list); list_move_tail(&bss->list, &local->bss_list);
spin_unlock_bh(&local->sta_bss_lock); spin_unlock_bh(&local->bss_lock);
#endif #endif
} }
...@@ -327,11 +327,11 @@ ieee80211_bss_info_update(struct ieee80211_local *local, ...@@ -327,11 +327,11 @@ ieee80211_bss_info_update(struct ieee80211_local *local,
} }
ieee80211_rx_result ieee80211_rx_result
ieee80211_sta_rx_scan(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb, ieee80211_scan_rx(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb,
struct ieee80211_rx_status *rx_status) struct ieee80211_rx_status *rx_status)
{ {
struct ieee80211_mgmt *mgmt; struct ieee80211_mgmt *mgmt;
struct ieee80211_sta_bss *bss; struct ieee80211_bss *bss;
u8 *elements; u8 *elements;
struct ieee80211_channel *channel; struct ieee80211_channel *channel;
size_t baselen; size_t baselen;
...@@ -430,7 +430,7 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw) ...@@ -430,7 +430,7 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw)
struct ieee80211_sub_if_data *sdata; struct ieee80211_sub_if_data *sdata;
union iwreq_data wrqu; union iwreq_data wrqu;
if (WARN_ON(!local->sta_hw_scanning && !local->sta_sw_scanning)) if (WARN_ON(!local->hw_scanning && !local->sw_scanning))
return; return;
local->last_scan_completed = jiffies; local->last_scan_completed = jiffies;
...@@ -445,8 +445,8 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw) ...@@ -445,8 +445,8 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw)
if (sdata) if (sdata)
wireless_send_event(sdata->dev, SIOCGIWSCAN, &wrqu, NULL); wireless_send_event(sdata->dev, SIOCGIWSCAN, &wrqu, NULL);
if (local->sta_hw_scanning) { if (local->hw_scanning) {
local->sta_hw_scanning = 0; local->hw_scanning = false;
if (ieee80211_hw_config(local)) if (ieee80211_hw_config(local))
printk(KERN_DEBUG "%s: failed to restore operational " printk(KERN_DEBUG "%s: failed to restore operational "
"channel after scan\n", wiphy_name(local->hw.wiphy)); "channel after scan\n", wiphy_name(local->hw.wiphy));
...@@ -454,7 +454,7 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw) ...@@ -454,7 +454,7 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw)
goto done; goto done;
} }
local->sta_sw_scanning = 0; local->sw_scanning = false;
if (ieee80211_hw_config(local)) if (ieee80211_hw_config(local))
printk(KERN_DEBUG "%s: failed to restore operational " printk(KERN_DEBUG "%s: failed to restore operational "
"channel after scan\n", wiphy_name(local->hw.wiphy)); "channel after scan\n", wiphy_name(local->hw.wiphy));
...@@ -492,7 +492,7 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw) ...@@ -492,7 +492,7 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw)
EXPORT_SYMBOL(ieee80211_scan_completed); EXPORT_SYMBOL(ieee80211_scan_completed);
void ieee80211_sta_scan_work(struct work_struct *work) void ieee80211_scan_work(struct work_struct *work)
{ {
struct ieee80211_local *local = struct ieee80211_local *local =
container_of(work, struct ieee80211_local, scan_work.work); container_of(work, struct ieee80211_local, scan_work.work);
...@@ -589,8 +589,8 @@ void ieee80211_sta_scan_work(struct work_struct *work) ...@@ -589,8 +589,8 @@ void ieee80211_sta_scan_work(struct work_struct *work)
} }
int ieee80211_sta_start_scan(struct ieee80211_sub_if_data *scan_sdata, int ieee80211_start_scan(struct ieee80211_sub_if_data *scan_sdata,
u8 *ssid, size_t ssid_len) u8 *ssid, size_t ssid_len)
{ {
struct ieee80211_local *local = scan_sdata->local; struct ieee80211_local *local = scan_sdata->local;
struct ieee80211_sub_if_data *sdata; struct ieee80211_sub_if_data *sdata;
...@@ -615,7 +615,7 @@ int ieee80211_sta_start_scan(struct ieee80211_sub_if_data *scan_sdata, ...@@ -615,7 +615,7 @@ int ieee80211_sta_start_scan(struct ieee80211_sub_if_data *scan_sdata,
* ResultCode: SUCCESS, INVALID_PARAMETERS * ResultCode: SUCCESS, INVALID_PARAMETERS
*/ */
if (local->sta_sw_scanning || local->sta_hw_scanning) { if (local->sw_scanning || local->hw_scanning) {
if (local->scan_sdata == scan_sdata) if (local->scan_sdata == scan_sdata)
return 0; return 0;
return -EBUSY; return -EBUSY;
...@@ -624,17 +624,17 @@ int ieee80211_sta_start_scan(struct ieee80211_sub_if_data *scan_sdata, ...@@ -624,17 +624,17 @@ int ieee80211_sta_start_scan(struct ieee80211_sub_if_data *scan_sdata,
if (local->ops->hw_scan) { if (local->ops->hw_scan) {
int rc; int rc;
local->sta_hw_scanning = 1; local->hw_scanning = true;
rc = local->ops->hw_scan(local_to_hw(local), ssid, ssid_len); rc = local->ops->hw_scan(local_to_hw(local), ssid, ssid_len);
if (rc) { if (rc) {
local->sta_hw_scanning = 0; local->hw_scanning = false;
return rc; return rc;
} }
local->scan_sdata = scan_sdata; local->scan_sdata = scan_sdata;
return 0; return 0;
} }
local->sta_sw_scanning = 1; local->sw_scanning = true;
rcu_read_lock(); rcu_read_lock();
list_for_each_entry_rcu(sdata, &local->interfaces, list) { list_for_each_entry_rcu(sdata, &local->interfaces, list) {
...@@ -675,13 +675,14 @@ int ieee80211_sta_start_scan(struct ieee80211_sub_if_data *scan_sdata, ...@@ -675,13 +675,14 @@ int ieee80211_sta_start_scan(struct ieee80211_sub_if_data *scan_sdata,
} }
int ieee80211_sta_req_scan(struct ieee80211_sub_if_data *sdata, u8 *ssid, size_t ssid_len) int ieee80211_request_scan(struct ieee80211_sub_if_data *sdata,
u8 *ssid, size_t ssid_len)
{ {
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
struct ieee80211_if_sta *ifsta; struct ieee80211_if_sta *ifsta;
if (sdata->vif.type != IEEE80211_IF_TYPE_STA) if (sdata->vif.type != IEEE80211_IF_TYPE_STA)
return ieee80211_sta_start_scan(sdata, ssid, ssid_len); return ieee80211_start_scan(sdata, ssid, ssid_len);
/* /*
* STA has a state machine that might need to defer scanning * STA has a state machine that might need to defer scanning
...@@ -689,7 +690,7 @@ int ieee80211_sta_req_scan(struct ieee80211_sub_if_data *sdata, u8 *ssid, size_t ...@@ -689,7 +690,7 @@ int ieee80211_sta_req_scan(struct ieee80211_sub_if_data *sdata, u8 *ssid, size_t
* queue it up to the state machine in that case. * queue it up to the state machine in that case.
*/ */
if (local->sta_sw_scanning || local->sta_hw_scanning) { if (local->sw_scanning || local->hw_scanning) {
if (local->scan_sdata == sdata) if (local->scan_sdata == sdata)
return 0; return 0;
return -EBUSY; return -EBUSY;
...@@ -707,9 +708,9 @@ int ieee80211_sta_req_scan(struct ieee80211_sub_if_data *sdata, u8 *ssid, size_t ...@@ -707,9 +708,9 @@ int ieee80211_sta_req_scan(struct ieee80211_sub_if_data *sdata, u8 *ssid, size_t
} }
static void ieee80211_sta_add_scan_ies(struct iw_request_info *info, static void ieee80211_scan_add_ies(struct iw_request_info *info,
struct ieee80211_sta_bss *bss, struct ieee80211_bss *bss,
char **current_ev, char *end_buf) char **current_ev, char *end_buf)
{ {
u8 *pos, *end, *next; u8 *pos, *end, *next;
struct iw_event iwe; struct iw_event iwe;
...@@ -749,10 +750,10 @@ static void ieee80211_sta_add_scan_ies(struct iw_request_info *info, ...@@ -749,10 +750,10 @@ static void ieee80211_sta_add_scan_ies(struct iw_request_info *info,
static char * static char *
ieee80211_sta_scan_result(struct ieee80211_local *local, ieee80211_scan_result(struct ieee80211_local *local,
struct iw_request_info *info, struct iw_request_info *info,
struct ieee80211_sta_bss *bss, struct ieee80211_bss *bss,
char *current_ev, char *end_buf) char *current_ev, char *end_buf)
{ {
struct iw_event iwe; struct iw_event iwe;
char *buf; char *buf;
...@@ -828,7 +829,7 @@ ieee80211_sta_scan_result(struct ieee80211_local *local, ...@@ -828,7 +829,7 @@ ieee80211_sta_scan_result(struct ieee80211_local *local,
current_ev = iwe_stream_add_point(info, current_ev, end_buf, current_ev = iwe_stream_add_point(info, current_ev, end_buf,
&iwe, ""); &iwe, "");
ieee80211_sta_add_scan_ies(info, bss, &current_ev, end_buf); ieee80211_scan_add_ies(info, bss, &current_ev, end_buf);
if (bss->supp_rates_len > 0) { if (bss->supp_rates_len > 0) {
/* display all supported rates in readable format */ /* display all supported rates in readable format */
...@@ -914,23 +915,23 @@ ieee80211_sta_scan_result(struct ieee80211_local *local, ...@@ -914,23 +915,23 @@ ieee80211_sta_scan_result(struct ieee80211_local *local,
} }
int ieee80211_sta_scan_results(struct ieee80211_local *local, int ieee80211_scan_results(struct ieee80211_local *local,
struct iw_request_info *info, struct iw_request_info *info,
char *buf, size_t len) char *buf, size_t len)
{ {
char *current_ev = buf; char *current_ev = buf;
char *end_buf = buf + len; char *end_buf = buf + len;
struct ieee80211_sta_bss *bss; struct ieee80211_bss *bss;
spin_lock_bh(&local->sta_bss_lock); spin_lock_bh(&local->bss_lock);
list_for_each_entry(bss, &local->sta_bss_list, list) { list_for_each_entry(bss, &local->bss_list, list) {
if (buf + len - current_ev <= IW_EV_ADDR_LEN) { if (buf + len - current_ev <= IW_EV_ADDR_LEN) {
spin_unlock_bh(&local->sta_bss_lock); spin_unlock_bh(&local->bss_lock);
return -E2BIG; return -E2BIG;
} }
current_ev = ieee80211_sta_scan_result(local, info, bss, current_ev = ieee80211_scan_result(local, info, bss,
current_ev, end_buf); current_ev, end_buf);
} }
spin_unlock_bh(&local->sta_bss_lock); spin_unlock_bh(&local->bss_lock);
return current_ev - buf; return current_ev - buf;
} }
net/mac80211/tx.c
View file @ c2b13452
...@@ -222,7 +222,7 @@ ieee80211_tx_h_check_assoc(struct ieee80211_tx_data *tx) ...@@ -222,7 +222,7 @@ ieee80211_tx_h_check_assoc(struct ieee80211_tx_data *tx)
if (unlikely(info->flags & IEEE80211_TX_CTL_INJECTED)) if (unlikely(info->flags & IEEE80211_TX_CTL_INJECTED))
return TX_CONTINUE; return TX_CONTINUE;
if (unlikely(tx->local->sta_sw_scanning) && if (unlikely(tx->local->sw_scanning) &&
!ieee80211_is_probe_req(hdr->frame_control)) !ieee80211_is_probe_req(hdr->frame_control))
return TX_DROP; return TX_DROP;
......
net/mac80211/util.c
View file @ c2b13452
...@@ -630,7 +630,7 @@ int ieee80211_set_freq(struct ieee80211_sub_if_data *sdata, int freqMHz) ...@@ -630,7 +630,7 @@ int ieee80211_set_freq(struct ieee80211_sub_if_data *sdata, int freqMHz)
} }
local->oper_channel = chan; local->oper_channel = chan;
if (local->sta_sw_scanning || local->sta_hw_scanning) if (local->sw_scanning || local->hw_scanning)
ret = 0; ret = 0;
else else
ret = ieee80211_hw_config(local); ret = ieee80211_hw_config(local);
......
net/mac80211/wext.c
View file @ c2b13452
...@@ -552,7 +552,7 @@ static int ieee80211_ioctl_siwscan(struct net_device *dev, ...@@ -552,7 +552,7 @@ static int ieee80211_ioctl_siwscan(struct net_device *dev,
ssid_len = req->essid_len; ssid_len = req->essid_len;
} }
return ieee80211_sta_req_scan(sdata, ssid, ssid_len); return ieee80211_request_scan(sdata, ssid, ssid_len);
} }
...@@ -566,10 +566,10 @@ static int ieee80211_ioctl_giwscan(struct net_device *dev, ...@@ -566,10 +566,10 @@ static int ieee80211_ioctl_giwscan(struct net_device *dev,
sdata = IEEE80211_DEV_TO_SUB_IF(dev); sdata = IEEE80211_DEV_TO_SUB_IF(dev);
if (local->sta_sw_scanning || local->sta_hw_scanning) if (local->sw_scanning || local->hw_scanning)
return -EAGAIN; return -EAGAIN;
res = ieee80211_sta_scan_results(local, info, extra, data->length); res = ieee80211_scan_results(local, info, extra, data->length);
if (res >= 0) { if (res >= 0) {
data->length = res; data->length = res;
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7