Skip to content

L
linux
Commit 8d61ffa5 authored by Johannes Berg's avatar Johannes Berg
Browse files
Options

cfg80211/mac80211: use cfg80211 wdev mutex in mac80211 

Using separate locks in cfg80211 and mac80211 has always
caused issues, for example having to unlock in places in
mac80211 to call cfg80211, which even needed a framework
to make cfg80211 calls after some functions returned etc.

Additionally, I suspect some issues people have reported
with the cfg80211 state getting confused could be due to
such issues, when cfg80211 is asking mac80211 to change
state but mac80211 is in the process of telling cfg80211
that the state changed (in another way.)
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 5fe231e8
Show whitespace changes
Inline Side-by-side
Showing with 220 additions and 355 deletions
Documentation/DocBook/80211.tmpl
View file @ 8d61ffa5
...@@ -132,9 +132,7 @@ ...@@ -132,9 +132,7 @@
!Finclude/net/cfg80211.h cfg80211_send_rx_assoc !Finclude/net/cfg80211.h cfg80211_send_rx_assoc
!Finclude/net/cfg80211.h cfg80211_send_assoc_timeout !Finclude/net/cfg80211.h cfg80211_send_assoc_timeout
!Finclude/net/cfg80211.h cfg80211_send_deauth !Finclude/net/cfg80211.h cfg80211_send_deauth
!Finclude/net/cfg80211.h __cfg80211_send_deauth
!Finclude/net/cfg80211.h cfg80211_send_disassoc !Finclude/net/cfg80211.h cfg80211_send_disassoc
!Finclude/net/cfg80211.h __cfg80211_send_disassoc
!Finclude/net/cfg80211.h cfg80211_ibss_joined !Finclude/net/cfg80211.h cfg80211_ibss_joined
!Finclude/net/cfg80211.h cfg80211_connect_result !Finclude/net/cfg80211.h cfg80211_connect_result
!Finclude/net/cfg80211.h cfg80211_roamed !Finclude/net/cfg80211.h cfg80211_roamed
......
include/net/cfg80211.h
View file @ 8d61ffa5
...@@ -1867,7 +1867,9 @@ struct cfg80211_update_ft_ies_params { ...@@ -1867,7 +1867,9 @@ struct cfg80211_update_ft_ies_params {
* @get_mpath: get a mesh path for the given parameters * @get_mpath: get a mesh path for the given parameters
* @dump_mpath: dump mesh path callback -- resume dump at index @idx * @dump_mpath: dump mesh path callback -- resume dump at index @idx
* @join_mesh: join the mesh network with the specified parameters * @join_mesh: join the mesh network with the specified parameters
* (invoked with the wireless_dev mutex held)
* @leave_mesh: leave the current mesh network * @leave_mesh: leave the current mesh network
* (invoked with the wireless_dev mutex held)
* *
* @get_mesh_config: Get the current mesh configuration * @get_mesh_config: Get the current mesh configuration
* *
...@@ -1894,20 +1896,28 @@ struct cfg80211_update_ft_ies_params { ...@@ -1894,20 +1896,28 @@ struct cfg80211_update_ft_ies_params {
* the scan/scan_done bracket too. * the scan/scan_done bracket too.
* *
* @auth: Request to authenticate with the specified peer * @auth: Request to authenticate with the specified peer
* (invoked with the wireless_dev mutex held)
* @assoc: Request to (re)associate with the specified peer * @assoc: Request to (re)associate with the specified peer
* (invoked with the wireless_dev mutex held)
* @deauth: Request to deauthenticate from the specified peer * @deauth: Request to deauthenticate from the specified peer
* (invoked with the wireless_dev mutex held)
* @disassoc: Request to disassociate from the specified peer * @disassoc: Request to disassociate from the specified peer
* (invoked with the wireless_dev mutex held)
* *
* @connect: Connect to the ESS with the specified parameters. When connected, * @connect: Connect to the ESS with the specified parameters. When connected,
* call cfg80211_connect_result() with status code %WLAN_STATUS_SUCCESS. * call cfg80211_connect_result() with status code %WLAN_STATUS_SUCCESS.
* If the connection fails for some reason, call cfg80211_connect_result() * If the connection fails for some reason, call cfg80211_connect_result()
* with the status from the AP. * with the status from the AP.
* (invoked with the wireless_dev mutex held)
* @disconnect: Disconnect from the BSS/ESS. * @disconnect: Disconnect from the BSS/ESS.
* (invoked with the wireless_dev mutex held)
* *
* @join_ibss: Join the specified IBSS (or create if necessary). Once done, call * @join_ibss: Join the specified IBSS (or create if necessary). Once done, call
* cfg80211_ibss_joined(), also call that function when changing BSSID due * cfg80211_ibss_joined(), also call that function when changing BSSID due
* to a merge. * to a merge.
* (invoked with the wireless_dev mutex held)
* @leave_ibss: Leave the IBSS. * @leave_ibss: Leave the IBSS.
* (invoked with the wireless_dev mutex held)
* *
* @set_mcast_rate: Set the specified multicast rate (only if vif is in ADHOC or * @set_mcast_rate: Set the specified multicast rate (only if vif is in ADHOC or
* MESH mode) * MESH mode)
...@@ -2851,7 +2861,8 @@ struct cfg80211_cached_keys; ...@@ -2851,7 +2861,8 @@ struct cfg80211_cached_keys;
* by cfg80211 on change_interface * by cfg80211 on change_interface
* @mgmt_registrations: list of registrations for management frames * @mgmt_registrations: list of registrations for management frames
* @mgmt_registrations_lock: lock for the list * @mgmt_registrations_lock: lock for the list
* @mtx: mutex used to lock data in this struct * @mtx: mutex used to lock data in this struct, may be used by drivers
* and some API functions require it held
* @cleanup_work: work struct used for cleanup that can't be done directly * @cleanup_work: work struct used for cleanup that can't be done directly
* @beacon_interval: beacon interval used on this device for transmitting * @beacon_interval: beacon interval used on this device for transmitting
* beacons, 0 when not valid * beacons, 0 when not valid
...@@ -3424,7 +3435,8 @@ void cfg80211_unlink_bss(struct wiphy *wiphy, struct cfg80211_bss *bss); ...@@ -3424,7 +3435,8 @@ void cfg80211_unlink_bss(struct wiphy *wiphy, struct cfg80211_bss *bss);
* This function is called whenever an authentication has been processed in * This function is called whenever an authentication has been processed in
* station mode. The driver is required to call either this function or * station mode. The driver is required to call either this function or
* cfg80211_send_auth_timeout() to indicate the result of cfg80211_ops::auth() * cfg80211_send_auth_timeout() to indicate the result of cfg80211_ops::auth()
* call. This function may sleep. * call. This function may sleep. The caller must hold the corresponding wdev's
* mutex.
*/ */
void cfg80211_send_rx_auth(struct net_device *dev, const u8 *buf, size_t len); void cfg80211_send_rx_auth(struct net_device *dev, const u8 *buf, size_t len);
...@@ -3433,7 +3445,8 @@ void cfg80211_send_rx_auth(struct net_device *dev, const u8 *buf, size_t len); ...@@ -3433,7 +3445,8 @@ void cfg80211_send_rx_auth(struct net_device *dev, const u8 *buf, size_t len);
* @dev: network device * @dev: network device
* @addr: The MAC address of the device with which the authentication timed out * @addr: The MAC address of the device with which the authentication timed out
* *
* This function may sleep. * This function may sleep. The caller must hold the corresponding wdev's
* mutex.
*/ */
void cfg80211_send_auth_timeout(struct net_device *dev, const u8 *addr); void cfg80211_send_auth_timeout(struct net_device *dev, const u8 *addr);
...@@ -3448,7 +3461,8 @@ void cfg80211_send_auth_timeout(struct net_device *dev, const u8 *addr); ...@@ -3448,7 +3461,8 @@ void cfg80211_send_auth_timeout(struct net_device *dev, const u8 *addr);
* This function is called whenever a (re)association response has been * This function is called whenever a (re)association response has been
* processed in station mode. The driver is required to call either this * processed in station mode. The driver is required to call either this
* function or cfg80211_send_assoc_timeout() to indicate the result of * function or cfg80211_send_assoc_timeout() to indicate the result of
* cfg80211_ops::assoc() call. This function may sleep. * cfg80211_ops::assoc() call. This function may sleep. The caller must hold
* the corresponding wdev's mutex.
*/ */
void cfg80211_send_rx_assoc(struct net_device *dev, struct cfg80211_bss *bss, void cfg80211_send_rx_assoc(struct net_device *dev, struct cfg80211_bss *bss,
const u8 *buf, size_t len); const u8 *buf, size_t len);
...@@ -3458,7 +3472,7 @@ void cfg80211_send_rx_assoc(struct net_device *dev, struct cfg80211_bss *bss, ...@@ -3458,7 +3472,7 @@ void cfg80211_send_rx_assoc(struct net_device *dev, struct cfg80211_bss *bss,
* @dev: network device * @dev: network device
* @addr: The MAC address of the device with which the association timed out * @addr: The MAC address of the device with which the association timed out
* *
* This function may sleep. * This function may sleep. The caller must hold the corresponding wdev's mutex.
*/ */
void cfg80211_send_assoc_timeout(struct net_device *dev, const u8 *addr); void cfg80211_send_assoc_timeout(struct net_device *dev, const u8 *addr);
...@@ -3470,20 +3484,11 @@ void cfg80211_send_assoc_timeout(struct net_device *dev, const u8 *addr); ...@@ -3470,20 +3484,11 @@ void cfg80211_send_assoc_timeout(struct net_device *dev, const u8 *addr);
* *
* This function is called whenever deauthentication has been processed in * This function is called whenever deauthentication has been processed in
* station mode. This includes both received deauthentication frames and * station mode. This includes both received deauthentication frames and
* locally generated ones. This function may sleep. * locally generated ones. This function may sleep. The caller must hold the
* corresponding wdev's mutex.
*/ */
void cfg80211_send_deauth(struct net_device *dev, const u8 *buf, size_t len); void cfg80211_send_deauth(struct net_device *dev, const u8 *buf, size_t len);
/**
* __cfg80211_send_deauth - notification of processed deauthentication
* @dev: network device
* @buf: deauthentication frame (header + body)
* @len: length of the frame data
*
* Like cfg80211_send_deauth(), but doesn't take the wdev lock.
*/
void __cfg80211_send_deauth(struct net_device *dev, const u8 *buf, size_t len);
/** /**
* cfg80211_send_disassoc - notification of processed disassociation * cfg80211_send_disassoc - notification of processed disassociation
* @dev: network device * @dev: network device
...@@ -3492,21 +3497,11 @@ void __cfg80211_send_deauth(struct net_device *dev, const u8 *buf, size_t len); ...@@ -3492,21 +3497,11 @@ void __cfg80211_send_deauth(struct net_device *dev, const u8 *buf, size_t len);
* *
* This function is called whenever disassociation has been processed in * This function is called whenever disassociation has been processed in
* station mode. This includes both received disassociation frames and locally * station mode. This includes both received disassociation frames and locally
* generated ones. This function may sleep. * generated ones. This function may sleep. The caller must hold the
* corresponding wdev's mutex.
*/ */
void cfg80211_send_disassoc(struct net_device *dev, const u8 *buf, size_t len); void cfg80211_send_disassoc(struct net_device *dev, const u8 *buf, size_t len);
/**
* __cfg80211_send_disassoc - notification of processed disassociation
* @dev: network device
* @buf: disassociation response frame (header + body)
* @len: length of the frame data
*
* Like cfg80211_send_disassoc(), but doesn't take the wdev lock.
*/
void __cfg80211_send_disassoc(struct net_device *dev, const u8 *buf,
size_t len);
/** /**
* cfg80211_send_unprot_deauth - notification of unprotected deauthentication * cfg80211_send_unprot_deauth - notification of unprotected deauthentication
* @dev: network device * @dev: network device
......
net/mac80211/cfg.c
View file @ 8d61ffa5
...@@ -2318,7 +2318,7 @@ int __ieee80211_request_smps(struct ieee80211_sub_if_data *sdata, ...@@ -2318,7 +2318,7 @@ int __ieee80211_request_smps(struct ieee80211_sub_if_data *sdata,
enum ieee80211_smps_mode old_req; enum ieee80211_smps_mode old_req;
int err; int err;
lockdep_assert_held(&sdata->u.mgd.mtx); lockdep_assert_held(&sdata->wdev.mtx);
old_req = sdata->u.mgd.req_smps; old_req = sdata->u.mgd.req_smps;
sdata->u.mgd.req_smps = smps_mode; sdata->u.mgd.req_smps = smps_mode;
...@@ -2375,9 +2375,7 @@ static int ieee80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev, ...@@ -2375,9 +2375,7 @@ static int ieee80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
local->dynamic_ps_forced_timeout = timeout; local->dynamic_ps_forced_timeout = timeout;
/* no change, but if automatic follow powersave */ /* no change, but if automatic follow powersave */
mutex_lock(&sdata->u.mgd.mtx);
__ieee80211_request_smps(sdata, sdata->u.mgd.req_smps); __ieee80211_request_smps(sdata, sdata->u.mgd.req_smps);
mutex_unlock(&sdata->u.mgd.mtx);
if (local->hw.flags & IEEE80211_HW_SUPPORTS_DYNAMIC_PS) if (local->hw.flags & IEEE80211_HW_SUPPORTS_DYNAMIC_PS)
ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS); ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);
......
net/mac80211/debugfs_netdev.c
View file @ 8d61ffa5
...@@ -228,9 +228,9 @@ static int ieee80211_set_smps(struct ieee80211_sub_if_data *sdata, ...@@ -228,9 +228,9 @@ static int ieee80211_set_smps(struct ieee80211_sub_if_data *sdata,
if (sdata->vif.type != NL80211_IFTYPE_STATION) if (sdata->vif.type != NL80211_IFTYPE_STATION)
return -EOPNOTSUPP; return -EOPNOTSUPP;
mutex_lock(&sdata->u.mgd.mtx); sdata_lock(sdata);
err = __ieee80211_request_smps(sdata, smps_mode); err = __ieee80211_request_smps(sdata, smps_mode);
mutex_unlock(&sdata->u.mgd.mtx); sdata_unlock(sdata);
return err; return err;
} }
...@@ -313,16 +313,16 @@ static ssize_t ieee80211_if_parse_tkip_mic_test( ...@@ -313,16 +313,16 @@ static ssize_t ieee80211_if_parse_tkip_mic_test(
case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_STATION:
fc |= cpu_to_le16(IEEE80211_FCTL_TODS); fc |= cpu_to_le16(IEEE80211_FCTL_TODS);
/* BSSID SA DA */ /* BSSID SA DA */
mutex_lock(&sdata->u.mgd.mtx); sdata_lock(sdata);
if (!sdata->u.mgd.associated) { if (!sdata->u.mgd.associated) {
mutex_unlock(&sdata->u.mgd.mtx); sdata_unlock(sdata);
dev_kfree_skb(skb); dev_kfree_skb(skb);
return -ENOTCONN; return -ENOTCONN;
} }
memcpy(hdr->addr1, sdata->u.mgd.associated->bssid, ETH_ALEN); memcpy(hdr->addr1, sdata->u.mgd.associated->bssid, ETH_ALEN);
memcpy(hdr->addr2, sdata->vif.addr, ETH_ALEN); memcpy(hdr->addr2, sdata->vif.addr, ETH_ALEN);
memcpy(hdr->addr3, addr, ETH_ALEN); memcpy(hdr->addr3, addr, ETH_ALEN);
mutex_unlock(&sdata->u.mgd.mtx); sdata_unlock(sdata);
break; break;
default: default:
dev_kfree_skb(skb); dev_kfree_skb(skb);
......
net/mac80211/ht.c
View file @ 8d61ffa5
...@@ -429,9 +429,9 @@ void ieee80211_request_smps_work(struct work_struct *work) ...@@ -429,9 +429,9 @@ void ieee80211_request_smps_work(struct work_struct *work)
container_of(work, struct ieee80211_sub_if_data, container_of(work, struct ieee80211_sub_if_data,
u.mgd.request_smps_work); u.mgd.request_smps_work);
mutex_lock(&sdata->u.mgd.mtx); sdata_lock(sdata);
__ieee80211_request_smps(sdata, sdata->u.mgd.driver_smps_mode); __ieee80211_request_smps(sdata, sdata->u.mgd.driver_smps_mode);
mutex_unlock(&sdata->u.mgd.mtx); sdata_unlock(sdata);
} }
void ieee80211_request_smps(struct ieee80211_vif *vif, void ieee80211_request_smps(struct ieee80211_vif *vif,
......
net/mac80211/ibss.c
View file @ 8d61ffa5
...@@ -54,7 +54,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, ...@@ -54,7 +54,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
struct beacon_data *presp; struct beacon_data *presp;
int frame_len; int frame_len;
lockdep_assert_held(&ifibss->mtx); sdata_assert_lock(sdata);
/* Reset own TSF to allow time synchronization work. */ /* Reset own TSF to allow time synchronization work. */
drv_reset_tsf(local, sdata); drv_reset_tsf(local, sdata);
...@@ -74,7 +74,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, ...@@ -74,7 +74,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
} }
presp = rcu_dereference_protected(ifibss->presp, presp = rcu_dereference_protected(ifibss->presp,
lockdep_is_held(&ifibss->mtx)); lockdep_is_held(&sdata->wdev.mtx));
rcu_assign_pointer(ifibss->presp, NULL); rcu_assign_pointer(ifibss->presp, NULL);
if (presp) if (presp)
kfree_rcu(presp, rcu_head); kfree_rcu(presp, rcu_head);
...@@ -263,7 +263,7 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, ...@@ -263,7 +263,7 @@ static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
const struct cfg80211_bss_ies *ies; const struct cfg80211_bss_ies *ies;
u64 tsf; u64 tsf;
lockdep_assert_held(&sdata->u.ibss.mtx); sdata_assert_lock(sdata);
if (beacon_int < 10) if (beacon_int < 10)
beacon_int = 10; beacon_int = 10;
...@@ -410,7 +410,7 @@ static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata, ...@@ -410,7 +410,7 @@ static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata,
struct sta_info *sta; struct sta_info *sta;
u8 deauth_frame_buf[IEEE80211_DEAUTH_FRAME_LEN]; u8 deauth_frame_buf[IEEE80211_DEAUTH_FRAME_LEN];
lockdep_assert_held(&sdata->u.ibss.mtx); sdata_assert_lock(sdata);
if (len < 24 + 6) if (len < 24 + 6)
return; return;
...@@ -677,7 +677,7 @@ static int ieee80211_sta_active_ibss(struct ieee80211_sub_if_data *sdata) ...@@ -677,7 +677,7 @@ static int ieee80211_sta_active_ibss(struct ieee80211_sub_if_data *sdata)
int active = 0; int active = 0;
struct sta_info *sta; struct sta_info *sta;
lockdep_assert_held(&sdata->u.ibss.mtx); sdata_assert_lock(sdata);
rcu_read_lock(); rcu_read_lock();
...@@ -703,7 +703,7 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata) ...@@ -703,7 +703,7 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata)
{ {
struct ieee80211_if_ibss *ifibss = &sdata->u.ibss; struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
lockdep_assert_held(&ifibss->mtx); sdata_assert_lock(sdata);
mod_timer(&ifibss->timer, mod_timer(&ifibss->timer,
round_jiffies(jiffies + IEEE80211_IBSS_MERGE_INTERVAL)); round_jiffies(jiffies + IEEE80211_IBSS_MERGE_INTERVAL));
...@@ -734,7 +734,7 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata) ...@@ -734,7 +734,7 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
u16 capability; u16 capability;
int i; int i;
lockdep_assert_held(&ifibss->mtx); sdata_assert_lock(sdata);
if (ifibss->fixed_bssid) { if (ifibss->fixed_bssid) {
memcpy(bssid, ifibss->bssid, ETH_ALEN); memcpy(bssid, ifibss->bssid, ETH_ALEN);
...@@ -777,7 +777,7 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata) ...@@ -777,7 +777,7 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
int active_ibss; int active_ibss;
u16 capability; u16 capability;
lockdep_assert_held(&ifibss->mtx); sdata_assert_lock(sdata);
active_ibss = ieee80211_sta_active_ibss(sdata); active_ibss = ieee80211_sta_active_ibss(sdata);
ibss_dbg(sdata, "sta_find_ibss (active_ibss=%d)\n", active_ibss); ibss_dbg(sdata, "sta_find_ibss (active_ibss=%d)\n", active_ibss);
...@@ -847,10 +847,10 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata, ...@@ -847,10 +847,10 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
struct beacon_data *presp; struct beacon_data *presp;
u8 *pos, *end; u8 *pos, *end;
lockdep_assert_held(&ifibss->mtx); sdata_assert_lock(sdata);
presp = rcu_dereference_protected(ifibss->presp, presp = rcu_dereference_protected(ifibss->presp,
lockdep_is_held(&ifibss->mtx)); lockdep_is_held(&sdata->wdev.mtx));
if (ifibss->state != IEEE80211_IBSS_MLME_JOINED || if (ifibss->state != IEEE80211_IBSS_MLME_JOINED ||
len < 24 + 2 || !presp) len < 24 + 2 || !presp)
...@@ -934,7 +934,7 @@ void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, ...@@ -934,7 +934,7 @@ void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
mgmt = (struct ieee80211_mgmt *) skb->data; mgmt = (struct ieee80211_mgmt *) skb->data;
fc = le16_to_cpu(mgmt->frame_control); fc = le16_to_cpu(mgmt->frame_control);
mutex_lock(&sdata->u.ibss.mtx); sdata_lock(sdata);
if (!sdata->u.ibss.ssid_len) if (!sdata->u.ibss.ssid_len)
goto mgmt_out; /* not ready to merge yet */ goto mgmt_out; /* not ready to merge yet */
...@@ -957,7 +957,7 @@ void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, ...@@ -957,7 +957,7 @@ void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
} }
mgmt_out: mgmt_out:
mutex_unlock(&sdata->u.ibss.mtx); sdata_unlock(sdata);
} }
void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata) void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata)
...@@ -965,7 +965,7 @@ void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata) ...@@ -965,7 +965,7 @@ void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata)
struct ieee80211_if_ibss *ifibss = &sdata->u.ibss; struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
struct sta_info *sta; struct sta_info *sta;
mutex_lock(&ifibss->mtx); sdata_lock(sdata);
/* /*
* Work could be scheduled after scan or similar * Work could be scheduled after scan or similar
...@@ -1001,7 +1001,7 @@ void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata) ...@@ -1001,7 +1001,7 @@ void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata)
} }
out: out:
mutex_unlock(&ifibss->mtx); sdata_unlock(sdata);
} }
static void ieee80211_ibss_timer(unsigned long data) static void ieee80211_ibss_timer(unsigned long data)
...@@ -1018,7 +1018,6 @@ void ieee80211_ibss_setup_sdata(struct ieee80211_sub_if_data *sdata) ...@@ -1018,7 +1018,6 @@ void ieee80211_ibss_setup_sdata(struct ieee80211_sub_if_data *sdata)
setup_timer(&ifibss->timer, ieee80211_ibss_timer, setup_timer(&ifibss->timer, ieee80211_ibss_timer,
(unsigned long) sdata); (unsigned long) sdata);
mutex_init(&ifibss->mtx);
INIT_LIST_HEAD(&ifibss->incomplete_stations); INIT_LIST_HEAD(&ifibss->incomplete_stations);
spin_lock_init(&ifibss->incomplete_lock); spin_lock_init(&ifibss->incomplete_lock);
} }
...@@ -1045,8 +1044,6 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata, ...@@ -1045,8 +1044,6 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
{ {
u32 changed = 0; u32 changed = 0;
mutex_lock(&sdata->u.ibss.mtx);
if (params->bssid) { if (params->bssid) {
memcpy(sdata->u.ibss.bssid, params->bssid, ETH_ALEN); memcpy(sdata->u.ibss.bssid, params->bssid, ETH_ALEN);
sdata->u.ibss.fixed_bssid = true; sdata->u.ibss.fixed_bssid = true;
...@@ -1079,8 +1076,6 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata, ...@@ -1079,8 +1076,6 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
memcpy(sdata->u.ibss.ssid, params->ssid, params->ssid_len); memcpy(sdata->u.ibss.ssid, params->ssid, params->ssid_len);
sdata->u.ibss.ssid_len = params->ssid_len; sdata->u.ibss.ssid_len = params->ssid_len;
mutex_unlock(&sdata->u.ibss.mtx);
/* /*
* 802.11n-2009 9.13.3.1: In an IBSS, the HT Protection field is * 802.11n-2009 9.13.3.1: In an IBSS, the HT Protection field is
* reserved, but an HT STA shall protect HT transmissions as though * reserved, but an HT STA shall protect HT transmissions as though
...@@ -1116,8 +1111,6 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata) ...@@ -1116,8 +1111,6 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)
struct sta_info *sta; struct sta_info *sta;
struct beacon_data *presp; struct beacon_data *presp;
mutex_lock(&sdata->u.ibss.mtx);
active_ibss = ieee80211_sta_active_ibss(sdata); active_ibss = ieee80211_sta_active_ibss(sdata);
if (!active_ibss && !is_zero_ether_addr(ifibss->bssid)) { if (!active_ibss && !is_zero_ether_addr(ifibss->bssid)) {
...@@ -1161,7 +1154,7 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata) ...@@ -1161,7 +1154,7 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)
/* remove beacon */ /* remove beacon */
kfree(sdata->u.ibss.ie); kfree(sdata->u.ibss.ie);
presp = rcu_dereference_protected(ifibss->presp, presp = rcu_dereference_protected(ifibss->presp,
lockdep_is_held(&sdata->u.ibss.mtx)); lockdep_is_held(&sdata->wdev.mtx));
RCU_INIT_POINTER(sdata->u.ibss.presp, NULL); RCU_INIT_POINTER(sdata->u.ibss.presp, NULL);
sdata->vif.bss_conf.ibss_joined = false; sdata->vif.bss_conf.ibss_joined = false;
sdata->vif.bss_conf.ibss_creator = false; sdata->vif.bss_conf.ibss_creator = false;
...@@ -1177,7 +1170,5 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata) ...@@ -1177,7 +1170,5 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)
del_timer_sync(&sdata->u.ibss.timer); del_timer_sync(&sdata->u.ibss.timer);
mutex_unlock(&sdata->u.ibss.mtx);
return 0; return 0;
} }
net/mac80211/ieee80211_i.h
View file @ 8d61ffa5
...@@ -394,7 +394,6 @@ struct ieee80211_if_managed { ...@@ -394,7 +394,6 @@ struct ieee80211_if_managed {
bool nullfunc_failed; bool nullfunc_failed;
bool connection_loss; bool connection_loss;
struct mutex mtx;
struct cfg80211_bss *associated; struct cfg80211_bss *associated;
struct ieee80211_mgd_auth_data *auth_data; struct ieee80211_mgd_auth_data *auth_data;
struct ieee80211_mgd_assoc_data *assoc_data; struct ieee80211_mgd_assoc_data *assoc_data;
...@@ -488,8 +487,6 @@ struct ieee80211_if_managed { ...@@ -488,8 +487,6 @@ struct ieee80211_if_managed {
struct ieee80211_if_ibss { struct ieee80211_if_ibss {
struct timer_list timer; struct timer_list timer;
struct mutex mtx;
unsigned long last_scan_completed; unsigned long last_scan_completed;
u32 basic_rates; u32 basic_rates;
...@@ -580,8 +577,6 @@ struct ieee80211_if_mesh { ...@@ -580,8 +577,6 @@ struct ieee80211_if_mesh {
bool accepting_plinks; bool accepting_plinks;
int num_gates; int num_gates;
struct beacon_data __rcu *beacon; struct beacon_data __rcu *beacon;
/* just protects beacon updates for now */
struct mutex mtx;
const u8 *ie; const u8 *ie;
u8 ie_len; u8 ie_len;
enum { enum {
...@@ -778,6 +773,26 @@ struct ieee80211_sub_if_data *vif_to_sdata(struct ieee80211_vif *p) ...@@ -778,6 +773,26 @@ struct ieee80211_sub_if_data *vif_to_sdata(struct ieee80211_vif *p)
return container_of(p, struct ieee80211_sub_if_data, vif); return container_of(p, struct ieee80211_sub_if_data, vif);
} }
static inline void sdata_lock(struct ieee80211_sub_if_data *sdata)
__acquires(&sdata->wdev.mtx)
{
mutex_lock(&sdata->wdev.mtx);
__acquire(&sdata->wdev.mtx);
}
static inline void sdata_unlock(struct ieee80211_sub_if_data *sdata)
__releases(&sdata->wdev.mtx)
{
mutex_unlock(&sdata->wdev.mtx);
__release(&sdata->wdev.mtx);
}
static inline void
sdata_assert_lock(struct ieee80211_sub_if_data *sdata)
{
lockdep_assert_held(&sdata->wdev.mtx);
}
static inline enum ieee80211_band static inline enum ieee80211_band
ieee80211_get_sdata_band(struct ieee80211_sub_if_data *sdata) ieee80211_get_sdata_band(struct ieee80211_sub_if_data *sdata)
{ {
......
net/mac80211/main.c
View file @ 8d61ffa5
...@@ -331,7 +331,7 @@ static int ieee80211_ifa_changed(struct notifier_block *nb, ...@@ -331,7 +331,7 @@ static int ieee80211_ifa_changed(struct notifier_block *nb,
return NOTIFY_DONE; return NOTIFY_DONE;
ifmgd = &sdata->u.mgd; ifmgd = &sdata->u.mgd;
mutex_lock(&ifmgd->mtx); sdata_lock(sdata);
/* Copy the addresses to the bss_conf list */ /* Copy the addresses to the bss_conf list */
ifa = idev->ifa_list; ifa = idev->ifa_list;
...@@ -349,7 +349,7 @@ static int ieee80211_ifa_changed(struct notifier_block *nb, ...@@ -349,7 +349,7 @@ static int ieee80211_ifa_changed(struct notifier_block *nb,
ieee80211_bss_info_change_notify(sdata, ieee80211_bss_info_change_notify(sdata,
BSS_CHANGED_ARP_FILTER); BSS_CHANGED_ARP_FILTER);
mutex_unlock(&ifmgd->mtx); sdata_unlock(sdata);
return NOTIFY_DONE; return NOTIFY_DONE;
} }
......
net/mac80211/mesh.c
View file @ 8d61ffa5
...@@ -161,8 +161,11 @@ void mesh_sta_cleanup(struct sta_info *sta) ...@@ -161,8 +161,11 @@ void mesh_sta_cleanup(struct sta_info *sta)
del_timer_sync(&sta->plink_timer); del_timer_sync(&sta->plink_timer);
} }
if (changed) if (changed) {
sdata_lock(sdata);
ieee80211_mbss_info_change_notify(sdata, changed); ieee80211_mbss_info_change_notify(sdata, changed);
sdata_unlock(sdata);
}
} }
int mesh_rmc_init(struct ieee80211_sub_if_data *sdata) int mesh_rmc_init(struct ieee80211_sub_if_data *sdata)
...@@ -577,7 +580,9 @@ static void ieee80211_mesh_housekeeping(struct ieee80211_sub_if_data *sdata) ...@@ -577,7 +580,9 @@ static void ieee80211_mesh_housekeeping(struct ieee80211_sub_if_data *sdata)
mesh_path_expire(sdata); mesh_path_expire(sdata);
changed = mesh_accept_plinks_update(sdata); changed = mesh_accept_plinks_update(sdata);
sdata_lock(sdata);
ieee80211_mbss_info_change_notify(sdata, changed); ieee80211_mbss_info_change_notify(sdata, changed);
sdata_unlock(sdata);
mod_timer(&ifmsh->housekeeping_timer, mod_timer(&ifmsh->housekeeping_timer,
round_jiffies(jiffies + round_jiffies(jiffies +
...@@ -697,25 +702,21 @@ ieee80211_mesh_build_beacon(struct ieee80211_if_mesh *ifmsh) ...@@ -697,25 +702,21 @@ ieee80211_mesh_build_beacon(struct ieee80211_if_mesh *ifmsh)
} }
static int static int
ieee80211_mesh_rebuild_beacon(struct ieee80211_if_mesh *ifmsh) ieee80211_mesh_rebuild_beacon(struct ieee80211_sub_if_data *sdata)
{ {
struct beacon_data *old_bcn; struct beacon_data *old_bcn;
int ret; int ret;
mutex_lock(&ifmsh->mtx); old_bcn = rcu_dereference_protected(sdata->u.mesh.beacon,
lockdep_is_held(&sdata->wdev.mtx));
old_bcn = rcu_dereference_protected(ifmsh->beacon, ret = ieee80211_mesh_build_beacon(&sdata->u.mesh);
lockdep_is_held(&ifmsh->mtx));
ret = ieee80211_mesh_build_beacon(ifmsh);
if (ret) if (ret)
/* just reuse old beacon */ /* just reuse old beacon */
goto out; return ret;
if (old_bcn) if (old_bcn)
kfree_rcu(old_bcn, rcu_head); kfree_rcu(old_bcn, rcu_head);
out: return 0;
mutex_unlock(&ifmsh->mtx);
return ret;
} }
void ieee80211_mbss_info_change_notify(struct ieee80211_sub_if_data *sdata, void ieee80211_mbss_info_change_notify(struct ieee80211_sub_if_data *sdata,
...@@ -726,7 +727,7 @@ void ieee80211_mbss_info_change_notify(struct ieee80211_sub_if_data *sdata, ...@@ -726,7 +727,7 @@ void ieee80211_mbss_info_change_notify(struct ieee80211_sub_if_data *sdata,
BSS_CHANGED_HT | BSS_CHANGED_HT |
BSS_CHANGED_BASIC_RATES | BSS_CHANGED_BASIC_RATES |
BSS_CHANGED_BEACON_INT))) BSS_CHANGED_BEACON_INT)))
if (ieee80211_mesh_rebuild_beacon(&sdata->u.mesh)) if (ieee80211_mesh_rebuild_beacon(sdata))
return; return;
ieee80211_bss_info_change_notify(sdata, changed); ieee80211_bss_info_change_notify(sdata, changed);
} }
...@@ -788,12 +789,12 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata) ...@@ -788,12 +789,12 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata)
sdata->vif.bss_conf.enable_beacon = false; sdata->vif.bss_conf.enable_beacon = false;
clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state); clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state);
ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED); ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);
mutex_lock(&ifmsh->mtx); sdata_lock(sdata);
bcn = rcu_dereference_protected(ifmsh->beacon, bcn = rcu_dereference_protected(ifmsh->beacon,
lockdep_is_held(&ifmsh->mtx)); lockdep_is_held(&sdata->wdev.mtx));
rcu_assign_pointer(ifmsh->beacon, NULL); rcu_assign_pointer(ifmsh->beacon, NULL);
kfree_rcu(bcn, rcu_head); kfree_rcu(bcn, rcu_head);
mutex_unlock(&ifmsh->mtx); sdata_unlock(sdata);
/* flush STAs and mpaths on this iface */ /* flush STAs and mpaths on this iface */
sta_info_flush(sdata); sta_info_flush(sdata);
...@@ -1041,7 +1042,6 @@ void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata) ...@@ -1041,7 +1042,6 @@ void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata)
spin_lock_init(&ifmsh->mesh_preq_queue_lock); spin_lock_init(&ifmsh->mesh_preq_queue_lock);
spin_lock_init(&ifmsh->sync_offset_lock); spin_lock_init(&ifmsh->sync_offset_lock);
RCU_INIT_POINTER(ifmsh->beacon, NULL); RCU_INIT_POINTER(ifmsh->beacon, NULL);
mutex_init(&ifmsh->mtx);
sdata->vif.bss_conf.bssid = zero_addr; sdata->vif.bss_conf.bssid = zero_addr;
} }
net/mac80211/mesh_plink.c
View file @ 8d61ffa5
...@@ -517,7 +517,9 @@ void mesh_neighbour_update(struct ieee80211_sub_if_data *sdata, ...@@ -517,7 +517,9 @@ void mesh_neighbour_update(struct ieee80211_sub_if_data *sdata,
ieee80211_mps_frame_release(sta, elems); ieee80211_mps_frame_release(sta, elems);
out: out:
rcu_read_unlock(); rcu_read_unlock();
sdata_lock(sdata);
ieee80211_mbss_info_change_notify(sdata, changed); ieee80211_mbss_info_change_notify(sdata, changed);
sdata_unlock(sdata);
} }
static void mesh_plink_timer(unsigned long data) static void mesh_plink_timer(unsigned long data)
...@@ -1068,6 +1070,9 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, ...@@ -1068,6 +1070,9 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata,
rcu_read_unlock(); rcu_read_unlock();
if (changed) if (changed) {
sdata_lock(sdata);
ieee80211_mbss_info_change_notify(sdata, changed); ieee80211_mbss_info_change_notify(sdata, changed);
sdata_unlock(sdata);
}
} }
net/mac80211/mlme.c
View file @ 8d61ffa5
...@@ -90,41 +90,6 @@ MODULE_PARM_DESC(probe_wait_ms, ...@@ -90,41 +90,6 @@ MODULE_PARM_DESC(probe_wait_ms,
*/ */
#define IEEE80211_SIGNAL_AVE_MIN_COUNT 4 #define IEEE80211_SIGNAL_AVE_MIN_COUNT 4
/*
* All cfg80211 functions have to be called outside a locked
* section so that they can acquire a lock themselves... This
* is much simpler than queuing up things in cfg80211, but we
* do need some indirection for that here.
*/
enum rx_mgmt_action {
/* no action required */
RX_MGMT_NONE,
/* caller must call cfg80211_send_deauth() */
RX_MGMT_CFG80211_DEAUTH,
/* caller must call cfg80211_send_disassoc() */
RX_MGMT_CFG80211_DISASSOC,
/* caller must call cfg80211_send_rx_auth() */
RX_MGMT_CFG80211_RX_AUTH,
/* caller must call cfg80211_send_rx_assoc() */
RX_MGMT_CFG80211_RX_ASSOC,
/* caller must call cfg80211_send_assoc_timeout() */
RX_MGMT_CFG80211_ASSOC_TIMEOUT,
/* used when a processed beacon causes a deauth */
RX_MGMT_CFG80211_TX_DEAUTH,
};
/* utils */
static inline void ASSERT_MGD_MTX(struct ieee80211_if_managed *ifmgd)
{
lockdep_assert_held(&ifmgd->mtx);
}
/* /*
* We can have multiple work items (and connection probing) * We can have multiple work items (and connection probing)
* scheduling this timer, but we need to take care to only * scheduling this timer, but we need to take care to only
...@@ -135,13 +100,14 @@ static inline void ASSERT_MGD_MTX(struct ieee80211_if_managed *ifmgd) ...@@ -135,13 +100,14 @@ static inline void ASSERT_MGD_MTX(struct ieee80211_if_managed *ifmgd)
* has happened -- the work that runs from this timer will * has happened -- the work that runs from this timer will
* do that. * do that.
*/ */
static void run_again(struct ieee80211_if_managed *ifmgd, unsigned long timeout) static void run_again(struct ieee80211_sub_if_data *sdata,
unsigned long timeout)
{ {
ASSERT_MGD_MTX(ifmgd); sdata_assert_lock(sdata);
if (!timer_pending(&ifmgd->timer) || if (!timer_pending(&sdata->u.mgd.timer) ||
time_before(timeout, ifmgd->timer.expires)) time_before(timeout, sdata->u.mgd.timer.expires))
mod_timer(&ifmgd->timer, timeout); mod_timer(&sdata->u.mgd.timer, timeout);
} }
void ieee80211_sta_reset_beacon_monitor(struct ieee80211_sub_if_data *sdata) void ieee80211_sta_reset_beacon_monitor(struct ieee80211_sub_if_data *sdata)
...@@ -652,7 +618,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata) ...@@ -652,7 +618,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
struct ieee80211_channel *chan; struct ieee80211_channel *chan;
u32 rates = 0; u32 rates = 0;
lockdep_assert_held(&ifmgd->mtx); sdata_assert_lock(sdata);
rcu_read_lock(); rcu_read_lock();
chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf); chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);
...@@ -962,7 +928,7 @@ static void ieee80211_chswitch_work(struct work_struct *work) ...@@ -962,7 +928,7 @@ static void ieee80211_chswitch_work(struct work_struct *work)
if (!ieee80211_sdata_running(sdata)) if (!ieee80211_sdata_running(sdata))
return; return;
mutex_lock(&ifmgd->mtx); sdata_lock(sdata);
if (!ifmgd->associated) if (!ifmgd->associated)
goto out; goto out;
...@@ -985,7 +951,7 @@ static void ieee80211_chswitch_work(struct work_struct *work) ...@@ -985,7 +951,7 @@ static void ieee80211_chswitch_work(struct work_struct *work)
IEEE80211_QUEUE_STOP_REASON_CSA); IEEE80211_QUEUE_STOP_REASON_CSA);
out: out:
ifmgd->flags &= ~IEEE80211_STA_CSA_RECEIVED; ifmgd->flags &= ~IEEE80211_STA_CSA_RECEIVED;
mutex_unlock(&ifmgd->mtx); sdata_unlock(sdata);
} }
void ieee80211_chswitch_done(struct ieee80211_vif *vif, bool success) void ieee80211_chswitch_done(struct ieee80211_vif *vif, bool success)
...@@ -1036,7 +1002,7 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata, ...@@ -1036,7 +1002,7 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata,
const struct ieee80211_ht_operation *ht_oper; const struct ieee80211_ht_operation *ht_oper;
int secondary_channel_offset = -1; int secondary_channel_offset = -1;
ASSERT_MGD_MTX(ifmgd); sdata_assert_lock(sdata);
if (!cbss) if (!cbss)
return; return;
...@@ -1845,7 +1811,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, ...@@ -1845,7 +1811,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
u32 changed = 0; u32 changed = 0;
ASSERT_MGD_MTX(ifmgd); sdata_assert_lock(sdata);
if (WARN_ON_ONCE(tx && !frame_buf)) if (WARN_ON_ONCE(tx && !frame_buf))
return; return;
...@@ -2054,7 +2020,7 @@ static void ieee80211_mgd_probe_ap_send(struct ieee80211_sub_if_data *sdata) ...@@ -2054,7 +2020,7 @@ static void ieee80211_mgd_probe_ap_send(struct ieee80211_sub_if_data *sdata)
} }
ifmgd->probe_timeout = jiffies + msecs_to_jiffies(probe_wait_ms); ifmgd->probe_timeout = jiffies + msecs_to_jiffies(probe_wait_ms);
run_again(ifmgd, ifmgd->probe_timeout); run_again(sdata, ifmgd->probe_timeout);
if (sdata->local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS) if (sdata->local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS)
ieee80211_flush_queues(sdata->local, sdata); ieee80211_flush_queues(sdata->local, sdata);
} }
...@@ -2068,7 +2034,7 @@ static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata, ...@@ -2068,7 +2034,7 @@ static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata,
if (!ieee80211_sdata_running(sdata)) if (!ieee80211_sdata_running(sdata))
return; return;
mutex_lock(&ifmgd->mtx); sdata_lock(sdata);
if (!ifmgd->associated) if (!ifmgd->associated)
goto out; goto out;
...@@ -2122,7 +2088,7 @@ static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata, ...@@ -2122,7 +2088,7 @@ static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata,
ifmgd->probe_send_count = 0; ifmgd->probe_send_count = 0;
ieee80211_mgd_probe_ap_send(sdata); ieee80211_mgd_probe_ap_send(sdata);
out: out:
mutex_unlock(&ifmgd->mtx); sdata_unlock(sdata);
} }
struct sk_buff *ieee80211_ap_probereq_get(struct ieee80211_hw *hw, struct sk_buff *ieee80211_ap_probereq_get(struct ieee80211_hw *hw,
...@@ -2138,7 +2104,7 @@ struct sk_buff *ieee80211_ap_probereq_get(struct ieee80211_hw *hw, ...@@ -2138,7 +2104,7 @@ struct sk_buff *ieee80211_ap_probereq_get(struct ieee80211_hw *hw,
if (WARN_ON(sdata->vif.type != NL80211_IFTYPE_STATION)) if (WARN_ON(sdata->vif.type != NL80211_IFTYPE_STATION))
return NULL; return NULL;
ASSERT_MGD_MTX(ifmgd); sdata_assert_lock(sdata);
if (ifmgd->associated) if (ifmgd->associated)
cbss = ifmgd->associated; cbss = ifmgd->associated;
...@@ -2171,9 +2137,9 @@ static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata) ...@@ -2171,9 +2137,9 @@ static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata)
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN]; u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN];
mutex_lock(&ifmgd->mtx); sdata_lock(sdata);
if (!ifmgd->associated) { if (!ifmgd->associated) {
mutex_unlock(&ifmgd->mtx); sdata_unlock(sdata);
return; return;
} }
...@@ -2184,13 +2150,9 @@ static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata) ...@@ -2184,13 +2150,9 @@ static void __ieee80211_disconnect(struct ieee80211_sub_if_data *sdata)
ieee80211_wake_queues_by_reason(&sdata->local->hw, ieee80211_wake_queues_by_reason(&sdata->local->hw,
IEEE80211_MAX_QUEUE_MAP, IEEE80211_MAX_QUEUE_MAP,
IEEE80211_QUEUE_STOP_REASON_CSA); IEEE80211_QUEUE_STOP_REASON_CSA);
mutex_unlock(&ifmgd->mtx);
/*
* must be outside lock due to cfg80211,
* but that's not a problem.
*/
cfg80211_send_deauth(sdata->dev, frame_buf, IEEE80211_DEAUTH_FRAME_LEN); cfg80211_send_deauth(sdata->dev, frame_buf, IEEE80211_DEAUTH_FRAME_LEN);
sdata_unlock(sdata);
} }
static void ieee80211_beacon_connection_loss_work(struct work_struct *work) static void ieee80211_beacon_connection_loss_work(struct work_struct *work)
...@@ -2257,7 +2219,7 @@ static void ieee80211_destroy_auth_data(struct ieee80211_sub_if_data *sdata, ...@@ -2257,7 +2219,7 @@ static void ieee80211_destroy_auth_data(struct ieee80211_sub_if_data *sdata,
{ {
struct ieee80211_mgd_auth_data *auth_data = sdata->u.mgd.auth_data; struct ieee80211_mgd_auth_data *auth_data = sdata->u.mgd.auth_data;
lockdep_assert_held(&sdata->u.mgd.mtx); sdata_assert_lock(sdata);
if (!assoc) { if (!assoc) {
sta_info_destroy_addr(sdata, auth_data->bss->bssid); sta_info_destroy_addr(sdata, auth_data->bss->bssid);
...@@ -2298,8 +2260,7 @@ static void ieee80211_auth_challenge(struct ieee80211_sub_if_data *sdata, ...@@ -2298,8 +2260,7 @@ static void ieee80211_auth_challenge(struct ieee80211_sub_if_data *sdata,
auth_data->key_idx, tx_flags); auth_data->key_idx, tx_flags);
} }
static enum rx_mgmt_action __must_check static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *mgmt, size_t len) struct ieee80211_mgmt *mgmt, size_t len)
{ {
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
...@@ -2307,18 +2268,18 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, ...@@ -2307,18 +2268,18 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
u16 auth_alg, auth_transaction, status_code; u16 auth_alg, auth_transaction, status_code;
struct sta_info *sta; struct sta_info *sta;
lockdep_assert_held(&ifmgd->mtx); sdata_assert_lock(sdata);
if (len < 24 + 6) if (len < 24 + 6)
return RX_MGMT_NONE; return;
if (!ifmgd->auth_data || ifmgd->auth_data->done) if (!ifmgd->auth_data || ifmgd->auth_data->done)
return RX_MGMT_NONE; return;
memcpy(bssid, ifmgd->auth_data->bss->bssid, ETH_ALEN); memcpy(bssid, ifmgd->auth_data->bss->bssid, ETH_ALEN);
if (!ether_addr_equal(bssid, mgmt->bssid)) if (!ether_addr_equal(bssid, mgmt->bssid))
return RX_MGMT_NONE; return;
auth_alg = le16_to_cpu(mgmt->u.auth.auth_alg); auth_alg = le16_to_cpu(mgmt->u.auth.auth_alg);
auth_transaction = le16_to_cpu(mgmt->u.auth.auth_transaction); auth_transaction = le16_to_cpu(mgmt->u.auth.auth_transaction);
...@@ -2330,14 +2291,15 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, ...@@ -2330,14 +2291,15 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
mgmt->sa, auth_alg, ifmgd->auth_data->algorithm, mgmt->sa, auth_alg, ifmgd->auth_data->algorithm,
auth_transaction, auth_transaction,
ifmgd->auth_data->expected_transaction); ifmgd->auth_data->expected_transaction);
return RX_MGMT_NONE; return;
} }
if (status_code != WLAN_STATUS_SUCCESS) { if (status_code != WLAN_STATUS_SUCCESS) {
sdata_info(sdata, "%pM denied authentication (status %d)\n", sdata_info(sdata, "%pM denied authentication (status %d)\n",
mgmt->sa, status_code); mgmt->sa, status_code);
ieee80211_destroy_auth_data(sdata, false); ieee80211_destroy_auth_data(sdata, false);
return RX_MGMT_CFG80211_RX_AUTH; cfg80211_send_rx_auth(sdata->dev, (u8 *)mgmt, len);
return;
} }
switch (ifmgd->auth_data->algorithm) { switch (ifmgd->auth_data->algorithm) {
...@@ -2350,20 +2312,20 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, ...@@ -2350,20 +2312,20 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
if (ifmgd->auth_data->expected_transaction != 4) { if (ifmgd->auth_data->expected_transaction != 4) {
ieee80211_auth_challenge(sdata, mgmt, len); ieee80211_auth_challenge(sdata, mgmt, len);
/* need another frame */ /* need another frame */
return RX_MGMT_NONE; return;
} }
break; break;
default: default:
WARN_ONCE(1, "invalid auth alg %d", WARN_ONCE(1, "invalid auth alg %d",
ifmgd->auth_data->algorithm); ifmgd->auth_data->algorithm);
return RX_MGMT_NONE; return;
} }
sdata_info(sdata, "authenticated\n"); sdata_info(sdata, "authenticated\n");
ifmgd->auth_data->done = true; ifmgd->auth_data->done = true;
ifmgd->auth_data->timeout = jiffies + IEEE80211_AUTH_WAIT_ASSOC; ifmgd->auth_data->timeout = jiffies + IEEE80211_AUTH_WAIT_ASSOC;
ifmgd->auth_data->timeout_started = true; ifmgd->auth_data->timeout_started = true;
run_again(ifmgd, ifmgd->auth_data->timeout); run_again(sdata, ifmgd->auth_data->timeout);
if (ifmgd->auth_data->algorithm == WLAN_AUTH_SAE && if (ifmgd->auth_data->algorithm == WLAN_AUTH_SAE &&
ifmgd->auth_data->expected_transaction != 2) { ifmgd->auth_data->expected_transaction != 2) {
...@@ -2371,7 +2333,8 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, ...@@ -2371,7 +2333,8 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
* Report auth frame to user space for processing since another * Report auth frame to user space for processing since another
* round of Authentication frames is still needed. * round of Authentication frames is still needed.
*/ */
return RX_MGMT_CFG80211_RX_AUTH; cfg80211_send_rx_auth(sdata->dev, (u8 *)mgmt, len);
return;
} }
/* move station state to auth */ /* move station state to auth */
...@@ -2387,30 +2350,29 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, ...@@ -2387,30 +2350,29 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
} }
mutex_unlock(&sdata->local->sta_mtx); mutex_unlock(&sdata->local->sta_mtx);
return RX_MGMT_CFG80211_RX_AUTH; cfg80211_send_rx_auth(sdata->dev, (u8 *)mgmt, len);
return;
out_err: out_err:
mutex_unlock(&sdata->local->sta_mtx); mutex_unlock(&sdata->local->sta_mtx);
/* ignore frame -- wait for timeout */ /* ignore frame -- wait for timeout */
return RX_MGMT_NONE;
} }
static enum rx_mgmt_action __must_check static void ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata,
ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *mgmt, size_t len) struct ieee80211_mgmt *mgmt, size_t len)
{ {
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
const u8 *bssid = NULL; const u8 *bssid = NULL;
u16 reason_code; u16 reason_code;
lockdep_assert_held(&ifmgd->mtx); sdata_assert_lock(sdata);
if (len < 24 + 2) if (len < 24 + 2)
return RX_MGMT_NONE; return;
if (!ifmgd->associated || if (!ifmgd->associated ||
!ether_addr_equal(mgmt->bssid, ifmgd->associated->bssid)) !ether_addr_equal(mgmt->bssid, ifmgd->associated->bssid))
return RX_MGMT_NONE; return;
bssid = ifmgd->associated->bssid; bssid = ifmgd->associated->bssid;
...@@ -2421,25 +2383,24 @@ ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata, ...@@ -2421,25 +2383,24 @@ ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata,
ieee80211_set_disassoc(sdata, 0, 0, false, NULL); ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
return RX_MGMT_CFG80211_DEAUTH; cfg80211_send_deauth(sdata->dev, (u8 *)mgmt, len);
} }
static enum rx_mgmt_action __must_check static void ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *mgmt, size_t len) struct ieee80211_mgmt *mgmt, size_t len)
{ {
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
u16 reason_code; u16 reason_code;
lockdep_assert_held(&ifmgd->mtx); sdata_assert_lock(sdata);
if (len < 24 + 2) if (len < 24 + 2)
return RX_MGMT_NONE; return;
if (!ifmgd->associated || if (!ifmgd->associated ||
!ether_addr_equal(mgmt->bssid, ifmgd->associated->bssid)) !ether_addr_equal(mgmt->bssid, ifmgd->associated->bssid))
return RX_MGMT_NONE; return;
reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code); reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
...@@ -2448,7 +2409,7 @@ ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata, ...@@ -2448,7 +2409,7 @@ ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
ieee80211_set_disassoc(sdata, 0, 0, false, NULL); ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
return RX_MGMT_CFG80211_DISASSOC; cfg80211_send_disassoc(sdata->dev, (u8 *)mgmt, len);
} }
static void ieee80211_get_rates(struct ieee80211_supported_band *sband, static void ieee80211_get_rates(struct ieee80211_supported_band *sband,
...@@ -2498,7 +2459,7 @@ static void ieee80211_destroy_assoc_data(struct ieee80211_sub_if_data *sdata, ...@@ -2498,7 +2459,7 @@ static void ieee80211_destroy_assoc_data(struct ieee80211_sub_if_data *sdata,
{ {
struct ieee80211_mgd_assoc_data *assoc_data = sdata->u.mgd.assoc_data; struct ieee80211_mgd_assoc_data *assoc_data = sdata->u.mgd.assoc_data;
lockdep_assert_held(&sdata->u.mgd.mtx); sdata_assert_lock(sdata);
if (!assoc) { if (!assoc) {
sta_info_destroy_addr(sdata, assoc_data->bss->bssid); sta_info_destroy_addr(sdata, assoc_data->bss->bssid);
...@@ -2679,10 +2640,9 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, ...@@ -2679,10 +2640,9 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
return true; return true;
} }
static enum rx_mgmt_action __must_check static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, struct ieee80211_mgmt *mgmt,
struct ieee80211_mgmt *mgmt, size_t len, size_t len)
struct cfg80211_bss **bss)
{ {
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
struct ieee80211_mgd_assoc_data *assoc_data = ifmgd->assoc_data; struct ieee80211_mgd_assoc_data *assoc_data = ifmgd->assoc_data;
...@@ -2690,13 +2650,14 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, ...@@ -2690,13 +2650,14 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
struct ieee802_11_elems elems; struct ieee802_11_elems elems;
u8 *pos; u8 *pos;
bool reassoc; bool reassoc;
struct cfg80211_bss *bss;
lockdep_assert_held(&ifmgd->mtx); sdata_assert_lock(sdata);
if (!assoc_data) if (!assoc_data)
return RX_MGMT_NONE; return;
if (!ether_addr_equal(assoc_data->bss->bssid, mgmt->bssid)) if (!ether_addr_equal(assoc_data->bss->bssid, mgmt->bssid))
return RX_MGMT_NONE; return;
/* /*
* AssocResp and ReassocResp have identical structure, so process both * AssocResp and ReassocResp have identical structure, so process both
...@@ -2704,7 +2665,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, ...@@ -2704,7 +2665,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
*/ */
if (len < 24 + 6) if (len < 24 + 6)
return RX_MGMT_NONE; return;
reassoc = ieee80211_is_reassoc_req(mgmt->frame_control); reassoc = ieee80211_is_reassoc_req(mgmt->frame_control);
capab_info = le16_to_cpu(mgmt->u.assoc_resp.capab_info); capab_info = le16_to_cpu(mgmt->u.assoc_resp.capab_info);
...@@ -2731,22 +2692,23 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, ...@@ -2731,22 +2692,23 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
assoc_data->timeout = jiffies + msecs_to_jiffies(ms); assoc_data->timeout = jiffies + msecs_to_jiffies(ms);
assoc_data->timeout_started = true; assoc_data->timeout_started = true;
if (ms > IEEE80211_ASSOC_TIMEOUT) if (ms > IEEE80211_ASSOC_TIMEOUT)
run_again(ifmgd, assoc_data->timeout); run_again(sdata, assoc_data->timeout);
return RX_MGMT_NONE; return;
} }
*bss = assoc_data->bss; bss = assoc_data->bss;
if (status_code != WLAN_STATUS_SUCCESS) { if (status_code != WLAN_STATUS_SUCCESS) {
sdata_info(sdata, "%pM denied association (code=%d)\n", sdata_info(sdata, "%pM denied association (code=%d)\n",
mgmt->sa, status_code); mgmt->sa, status_code);
ieee80211_destroy_assoc_data(sdata, false); ieee80211_destroy_assoc_data(sdata, false);
} else { } else {
if (!ieee80211_assoc_success(sdata, *bss, mgmt, len)) { if (!ieee80211_assoc_success(sdata, bss, mgmt, len)) {
/* oops -- internal error -- send timeout for now */ /* oops -- internal error -- send timeout for now */
ieee80211_destroy_assoc_data(sdata, false); ieee80211_destroy_assoc_data(sdata, false);
cfg80211_put_bss(sdata->local->hw.wiphy, *bss); cfg80211_put_bss(sdata->local->hw.wiphy, bss);
return RX_MGMT_CFG80211_ASSOC_TIMEOUT; cfg80211_send_assoc_timeout(sdata->dev, mgmt->bssid);
return;
} }
sdata_info(sdata, "associated\n"); sdata_info(sdata, "associated\n");
...@@ -2758,7 +2720,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, ...@@ -2758,7 +2720,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
ieee80211_destroy_assoc_data(sdata, true); ieee80211_destroy_assoc_data(sdata, true);
} }
return RX_MGMT_CFG80211_RX_ASSOC; cfg80211_send_rx_assoc(sdata->dev, bss, (u8 *)mgmt, len);
} }
static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
...@@ -2772,7 +2734,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, ...@@ -2772,7 +2734,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
struct ieee80211_channel *channel; struct ieee80211_channel *channel;
bool need_ps = false; bool need_ps = false;
lockdep_assert_held(&sdata->u.mgd.mtx); sdata_assert_lock(sdata);
if ((sdata->u.mgd.associated && if ((sdata->u.mgd.associated &&
ether_addr_equal(mgmt->bssid, sdata->u.mgd.associated->bssid)) || ether_addr_equal(mgmt->bssid, sdata->u.mgd.associated->bssid)) ||
...@@ -2831,7 +2793,7 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata, ...@@ -2831,7 +2793,7 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata,
ifmgd = &sdata->u.mgd; ifmgd = &sdata->u.mgd;
ASSERT_MGD_MTX(ifmgd); sdata_assert_lock(sdata);
if (!ether_addr_equal(mgmt->da, sdata->vif.addr)) if (!ether_addr_equal(mgmt->da, sdata->vif.addr))
return; /* ignore ProbeResp to foreign address */ return; /* ignore ProbeResp to foreign address */
...@@ -2856,7 +2818,7 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata, ...@@ -2856,7 +2818,7 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata,
ifmgd->auth_data->tries = 0; ifmgd->auth_data->tries = 0;
ifmgd->auth_data->timeout = jiffies; ifmgd->auth_data->timeout = jiffies;
ifmgd->auth_data->timeout_started = true; ifmgd->auth_data->timeout_started = true;
run_again(ifmgd, ifmgd->auth_data->timeout); run_again(sdata, ifmgd->auth_data->timeout);
} }
} }
...@@ -2881,10 +2843,9 @@ static const u64 care_about_ies = ...@@ -2881,10 +2843,9 @@ static const u64 care_about_ies =
(1ULL << WLAN_EID_HT_CAPABILITY) | (1ULL << WLAN_EID_HT_CAPABILITY) |
(1ULL << WLAN_EID_HT_OPERATION); (1ULL << WLAN_EID_HT_OPERATION);
static enum rx_mgmt_action static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
struct ieee80211_mgmt *mgmt, size_t len, struct ieee80211_mgmt *mgmt, size_t len,
u8 *deauth_buf, struct ieee80211_rx_status *rx_status) struct ieee80211_rx_status *rx_status)
{ {
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
struct ieee80211_bss_conf *bss_conf = &sdata->vif.bss_conf; struct ieee80211_bss_conf *bss_conf = &sdata->vif.bss_conf;
...@@ -2899,24 +2860,25 @@ ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, ...@@ -2899,24 +2860,25 @@ ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
u8 erp_value = 0; u8 erp_value = 0;
u32 ncrc; u32 ncrc;
u8 *bssid; u8 *bssid;
u8 deauth_buf[IEEE80211_DEAUTH_FRAME_LEN];
lockdep_assert_held(&ifmgd->mtx); sdata_assert_lock(sdata);
/* Process beacon from the current BSS */ /* Process beacon from the current BSS */
baselen = (u8 *) mgmt->u.beacon.variable - (u8 *) mgmt; baselen = (u8 *) mgmt->u.beacon.variable - (u8 *) mgmt;
if (baselen > len) if (baselen > len)
return RX_MGMT_NONE; return;
rcu_read_lock(); rcu_read_lock();
chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf); chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);
if (!chanctx_conf) { if (!chanctx_conf) {
rcu_read_unlock(); rcu_read_unlock();
return RX_MGMT_NONE; return;
} }
if (rx_status->freq != chanctx_conf->def.chan->center_freq) { if (rx_status->freq != chanctx_conf->def.chan->center_freq) {
rcu_read_unlock(); rcu_read_unlock();
return RX_MGMT_NONE; return;
} }
chan = chanctx_conf->def.chan; chan = chanctx_conf->def.chan;
rcu_read_unlock(); rcu_read_unlock();
...@@ -2943,13 +2905,13 @@ ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, ...@@ -2943,13 +2905,13 @@ ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
/* continue assoc process */ /* continue assoc process */
ifmgd->assoc_data->timeout = jiffies; ifmgd->assoc_data->timeout = jiffies;
ifmgd->assoc_data->timeout_started = true; ifmgd->assoc_data->timeout_started = true;
run_again(ifmgd, ifmgd->assoc_data->timeout); run_again(sdata, ifmgd->assoc_data->timeout);
return RX_MGMT_NONE; return;
} }
if (!ifmgd->associated || if (!ifmgd->associated ||
!ether_addr_equal(mgmt->bssid, ifmgd->associated->bssid)) !ether_addr_equal(mgmt->bssid, ifmgd->associated->bssid))
return RX_MGMT_NONE; return;
bssid = ifmgd->associated->bssid; bssid = ifmgd->associated->bssid;
/* Track average RSSI from the Beacon frames of the current AP */ /* Track average RSSI from the Beacon frames of the current AP */
...@@ -3095,7 +3057,7 @@ ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, ...@@ -3095,7 +3057,7 @@ ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
} }
if (ncrc == ifmgd->beacon_crc && ifmgd->beacon_crc_valid) if (ncrc == ifmgd->beacon_crc && ifmgd->beacon_crc_valid)
return RX_MGMT_NONE; return;
ifmgd->beacon_crc = ncrc; ifmgd->beacon_crc = ncrc;
ifmgd->beacon_crc_valid = true; ifmgd->beacon_crc_valid = true;
...@@ -3151,7 +3113,9 @@ ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, ...@@ -3151,7 +3113,9 @@ ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,
WLAN_REASON_DEAUTH_LEAVING, WLAN_REASON_DEAUTH_LEAVING,
true, deauth_buf); true, deauth_buf);
return RX_MGMT_CFG80211_TX_DEAUTH; cfg80211_send_deauth(sdata->dev, deauth_buf,
sizeof(deauth_buf));
return;
} }
if (sta && elems.opmode_notif) if (sta && elems.opmode_notif)
...@@ -3168,19 +3132,13 @@ ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, ...@@ -3168,19 +3132,13 @@ ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
elems.pwr_constr_elem); elems.pwr_constr_elem);
ieee80211_bss_info_change_notify(sdata, changed); ieee80211_bss_info_change_notify(sdata, changed);
return RX_MGMT_NONE;
} }
void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb) struct sk_buff *skb)
{ {
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
struct ieee80211_rx_status *rx_status; struct ieee80211_rx_status *rx_status;
struct ieee80211_mgmt *mgmt; struct ieee80211_mgmt *mgmt;
struct cfg80211_bss *bss = NULL;
enum rx_mgmt_action rma = RX_MGMT_NONE;
u8 deauth_buf[IEEE80211_DEAUTH_FRAME_LEN];
u16 fc; u16 fc;
struct ieee802_11_elems elems; struct ieee802_11_elems elems;
int ies_len; int ies_len;
...@@ -3189,28 +3147,27 @@ void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, ...@@ -3189,28 +3147,27 @@ void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
mgmt = (struct ieee80211_mgmt *) skb->data; mgmt = (struct ieee80211_mgmt *) skb->data;
fc = le16_to_cpu(mgmt->frame_control); fc = le16_to_cpu(mgmt->frame_control);
mutex_lock(&ifmgd->mtx); sdata_lock(sdata);
switch (fc & IEEE80211_FCTL_STYPE) { switch (fc & IEEE80211_FCTL_STYPE) {
case IEEE80211_STYPE_BEACON: case IEEE80211_STYPE_BEACON:
rma = ieee80211_rx_mgmt_beacon(sdata, mgmt, skb->len, ieee80211_rx_mgmt_beacon(sdata, mgmt, skb->len, rx_status);
deauth_buf, rx_status);
break; break;
case IEEE80211_STYPE_PROBE_RESP: case IEEE80211_STYPE_PROBE_RESP:
ieee80211_rx_mgmt_probe_resp(sdata, skb); ieee80211_rx_mgmt_probe_resp(sdata, skb);
break; break;
case IEEE80211_STYPE_AUTH: case IEEE80211_STYPE_AUTH:
rma = ieee80211_rx_mgmt_auth(sdata, mgmt, skb->len); ieee80211_rx_mgmt_auth(sdata, mgmt, skb->len);
break; break;
case IEEE80211_STYPE_DEAUTH: case IEEE80211_STYPE_DEAUTH:
rma = ieee80211_rx_mgmt_deauth(sdata, mgmt, skb->len); ieee80211_rx_mgmt_deauth(sdata, mgmt, skb->len);
break; break;
case IEEE80211_STYPE_DISASSOC: case IEEE80211_STYPE_DISASSOC:
rma = ieee80211_rx_mgmt_disassoc(sdata, mgmt, skb->len); ieee80211_rx_mgmt_disassoc(sdata, mgmt, skb->len);
break; break;
case IEEE80211_STYPE_ASSOC_RESP: case IEEE80211_STYPE_ASSOC_RESP:
case IEEE80211_STYPE_REASSOC_RESP: case IEEE80211_STYPE_REASSOC_RESP:
rma = ieee80211_rx_mgmt_assoc_resp(sdata, mgmt, skb->len, &bss); ieee80211_rx_mgmt_assoc_resp(sdata, mgmt, skb->len);
break; break;
case IEEE80211_STYPE_ACTION: case IEEE80211_STYPE_ACTION:
if (mgmt->u.action.category == WLAN_CATEGORY_SPECTRUM_MGMT) { if (mgmt->u.action.category == WLAN_CATEGORY_SPECTRUM_MGMT) {
...@@ -3256,34 +3213,7 @@ void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, ...@@ -3256,34 +3213,7 @@ void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
} }
break; break;
} }
mutex_unlock(&ifmgd->mtx); sdata_unlock(sdata);
switch (rma) {
case RX_MGMT_NONE:
/* no action */
break;
case RX_MGMT_CFG80211_DEAUTH:
cfg80211_send_deauth(sdata->dev, (u8 *)mgmt, skb->len);
break;
case RX_MGMT_CFG80211_DISASSOC:
cfg80211_send_disassoc(sdata->dev, (u8 *)mgmt, skb->len);
break;
case RX_MGMT_CFG80211_RX_AUTH:
cfg80211_send_rx_auth(sdata->dev, (u8 *)mgmt, skb->len);
break;
case RX_MGMT_CFG80211_RX_ASSOC:
cfg80211_send_rx_assoc(sdata->dev, bss, (u8 *)mgmt, skb->len);
break;
case RX_MGMT_CFG80211_ASSOC_TIMEOUT:
cfg80211_send_assoc_timeout(sdata->dev, mgmt->bssid);
break;
case RX_MGMT_CFG80211_TX_DEAUTH:
cfg80211_send_deauth(sdata->dev, deauth_buf,
sizeof(deauth_buf));
break;
default:
WARN(1, "unexpected: %d", rma);
}
} }
static void ieee80211_sta_timer(unsigned long data) static void ieee80211_sta_timer(unsigned long data)
...@@ -3297,20 +3227,12 @@ static void ieee80211_sta_timer(unsigned long data) ...@@ -3297,20 +3227,12 @@ static void ieee80211_sta_timer(unsigned long data)
static void ieee80211_sta_connection_lost(struct ieee80211_sub_if_data *sdata, static void ieee80211_sta_connection_lost(struct ieee80211_sub_if_data *sdata,
u8 *bssid, u8 reason, bool tx) u8 *bssid, u8 reason, bool tx)
{ {
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN]; u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN];
ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, reason, ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, reason,
tx, frame_buf); tx, frame_buf);
mutex_unlock(&ifmgd->mtx);
/*
* must be outside lock due to cfg80211,
* but that's not a problem.
*/
cfg80211_send_deauth(sdata->dev, frame_buf, IEEE80211_DEAUTH_FRAME_LEN); cfg80211_send_deauth(sdata->dev, frame_buf, IEEE80211_DEAUTH_FRAME_LEN);
mutex_lock(&ifmgd->mtx);
} }
static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata) static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata)
...@@ -3320,7 +3242,7 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata) ...@@ -3320,7 +3242,7 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata)
struct ieee80211_mgd_auth_data *auth_data = ifmgd->auth_data; struct ieee80211_mgd_auth_data *auth_data = ifmgd->auth_data;
u32 tx_flags = 0; u32 tx_flags = 0;
lockdep_assert_held(&ifmgd->mtx); sdata_assert_lock(sdata);
if (WARN_ON_ONCE(!auth_data)) if (WARN_ON_ONCE(!auth_data))
return -EINVAL; return -EINVAL;
...@@ -3393,7 +3315,7 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata) ...@@ -3393,7 +3315,7 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata)
if (tx_flags == 0) { if (tx_flags == 0) {
auth_data->timeout = jiffies + IEEE80211_AUTH_TIMEOUT; auth_data->timeout = jiffies + IEEE80211_AUTH_TIMEOUT;
ifmgd->auth_data->timeout_started = true; ifmgd->auth_data->timeout_started = true;
run_again(ifmgd, auth_data->timeout); run_again(sdata, auth_data->timeout);
} else { } else {
auth_data->timeout_started = false; auth_data->timeout_started = false;
} }
...@@ -3406,7 +3328,7 @@ static int ieee80211_do_assoc(struct ieee80211_sub_if_data *sdata) ...@@ -3406,7 +3328,7 @@ static int ieee80211_do_assoc(struct ieee80211_sub_if_data *sdata)
struct ieee80211_mgd_assoc_data *assoc_data = sdata->u.mgd.assoc_data; struct ieee80211_mgd_assoc_data *assoc_data = sdata->u.mgd.assoc_data;
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
lockdep_assert_held(&sdata->u.mgd.mtx); sdata_assert_lock(sdata);
assoc_data->tries++; assoc_data->tries++;
if (assoc_data->tries > IEEE80211_ASSOC_MAX_TRIES) { if (assoc_data->tries > IEEE80211_ASSOC_MAX_TRIES) {
...@@ -3430,7 +3352,7 @@ static int ieee80211_do_assoc(struct ieee80211_sub_if_data *sdata) ...@@ -3430,7 +3352,7 @@ static int ieee80211_do_assoc(struct ieee80211_sub_if_data *sdata)
if (!(local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS)) { if (!(local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS)) {
assoc_data->timeout = jiffies + IEEE80211_ASSOC_TIMEOUT; assoc_data->timeout = jiffies + IEEE80211_ASSOC_TIMEOUT;
assoc_data->timeout_started = true; assoc_data->timeout_started = true;
run_again(&sdata->u.mgd, assoc_data->timeout); run_again(sdata, assoc_data->timeout);
} else { } else {
assoc_data->timeout_started = false; assoc_data->timeout_started = false;
} }
...@@ -3455,7 +3377,7 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata) ...@@ -3455,7 +3377,7 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata)
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
mutex_lock(&ifmgd->mtx); sdata_lock(sdata);
if (ifmgd->status_received) { if (ifmgd->status_received) {
__le16 fc = ifmgd->status_fc; __le16 fc = ifmgd->status_fc;
...@@ -3467,7 +3389,7 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata) ...@@ -3467,7 +3389,7 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata)
if (status_acked) { if (status_acked) {
ifmgd->auth_data->timeout = ifmgd->auth_data->timeout =
jiffies + IEEE80211_AUTH_TIMEOUT_SHORT; jiffies + IEEE80211_AUTH_TIMEOUT_SHORT;
run_again(ifmgd, ifmgd->auth_data->timeout); run_again(sdata, ifmgd->auth_data->timeout);
} else { } else {
ifmgd->auth_data->timeout = jiffies - 1; ifmgd->auth_data->timeout = jiffies - 1;
} }
...@@ -3478,7 +3400,7 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata) ...@@ -3478,7 +3400,7 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata)
if (status_acked) { if (status_acked) {
ifmgd->assoc_data->timeout = ifmgd->assoc_data->timeout =
jiffies + IEEE80211_ASSOC_TIMEOUT_SHORT; jiffies + IEEE80211_ASSOC_TIMEOUT_SHORT;
run_again(ifmgd, ifmgd->assoc_data->timeout); run_again(sdata, ifmgd->assoc_data->timeout);
} else { } else {
ifmgd->assoc_data->timeout = jiffies - 1; ifmgd->assoc_data->timeout = jiffies - 1;
} }
...@@ -3501,12 +3423,10 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata) ...@@ -3501,12 +3423,10 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata)
ieee80211_destroy_auth_data(sdata, false); ieee80211_destroy_auth_data(sdata, false);
mutex_unlock(&ifmgd->mtx);
cfg80211_send_auth_timeout(sdata->dev, bssid); cfg80211_send_auth_timeout(sdata->dev, bssid);
mutex_lock(&ifmgd->mtx);
} }
} else if (ifmgd->auth_data && ifmgd->auth_data->timeout_started) } else if (ifmgd->auth_data && ifmgd->auth_data->timeout_started)
run_again(ifmgd, ifmgd->auth_data->timeout); run_again(sdata, ifmgd->auth_data->timeout);
if (ifmgd->assoc_data && ifmgd->assoc_data->timeout_started && if (ifmgd->assoc_data && ifmgd->assoc_data->timeout_started &&
time_after(jiffies, ifmgd->assoc_data->timeout)) { time_after(jiffies, ifmgd->assoc_data->timeout)) {
...@@ -3519,12 +3439,10 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata) ...@@ -3519,12 +3439,10 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata)
ieee80211_destroy_assoc_data(sdata, false); ieee80211_destroy_assoc_data(sdata, false);
mutex_unlock(&ifmgd->mtx);
cfg80211_send_assoc_timeout(sdata->dev, bssid); cfg80211_send_assoc_timeout(sdata->dev, bssid);
mutex_lock(&ifmgd->mtx);
} }
} else if (ifmgd->assoc_data && ifmgd->assoc_data->timeout_started) } else if (ifmgd->assoc_data && ifmgd->assoc_data->timeout_started)
run_again(ifmgd, ifmgd->assoc_data->timeout); run_again(sdata, ifmgd->assoc_data->timeout);
if (ifmgd->flags & (IEEE80211_STA_BEACON_POLL | if (ifmgd->flags & (IEEE80211_STA_BEACON_POLL |
IEEE80211_STA_CONNECTION_POLL) && IEEE80211_STA_CONNECTION_POLL) &&
...@@ -3558,7 +3476,7 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata) ...@@ -3558,7 +3476,7 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata)
false); false);
} }
} else if (time_is_after_jiffies(ifmgd->probe_timeout)) } else if (time_is_after_jiffies(ifmgd->probe_timeout))
run_again(ifmgd, ifmgd->probe_timeout); run_again(sdata, ifmgd->probe_timeout);
else if (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS) { else if (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS) {
mlme_dbg(sdata, mlme_dbg(sdata,
"Failed to send nullfunc to AP %pM after %dms, disconnecting\n", "Failed to send nullfunc to AP %pM after %dms, disconnecting\n",
...@@ -3587,7 +3505,7 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata) ...@@ -3587,7 +3505,7 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata)
} }
} }
mutex_unlock(&ifmgd->mtx); sdata_unlock(sdata);
} }
static void ieee80211_sta_bcn_mon_timer(unsigned long data) static void ieee80211_sta_bcn_mon_timer(unsigned long data)
...@@ -3648,9 +3566,9 @@ void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata) ...@@ -3648,9 +3566,9 @@ void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata)
{ {
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
mutex_lock(&ifmgd->mtx); sdata_lock(sdata);
if (!ifmgd->associated) { if (!ifmgd->associated) {
mutex_unlock(&ifmgd->mtx); sdata_unlock(sdata);
return; return;
} }
...@@ -3661,10 +3579,10 @@ void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata) ...@@ -3661,10 +3579,10 @@ void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata)
ifmgd->associated->bssid, ifmgd->associated->bssid,
WLAN_REASON_UNSPECIFIED, WLAN_REASON_UNSPECIFIED,
true); true);
mutex_unlock(&ifmgd->mtx); sdata_unlock(sdata);
return; return;
} }
mutex_unlock(&ifmgd->mtx); sdata_unlock(sdata);
} }
#endif #endif
...@@ -3696,8 +3614,6 @@ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata) ...@@ -3696,8 +3614,6 @@ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata)
ifmgd->uapsd_max_sp_len = sdata->local->hw.uapsd_max_sp_len; ifmgd->uapsd_max_sp_len = sdata->local->hw.uapsd_max_sp_len;
ifmgd->p2p_noa_index = -1; ifmgd->p2p_noa_index = -1;
mutex_init(&ifmgd->mtx);
if (sdata->local->hw.flags & IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS) if (sdata->local->hw.flags & IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS)
ifmgd->req_smps = IEEE80211_SMPS_AUTOMATIC; ifmgd->req_smps = IEEE80211_SMPS_AUTOMATIC;
else else
...@@ -4053,8 +3969,6 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata, ...@@ -4053,8 +3969,6 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
/* try to authenticate/probe */ /* try to authenticate/probe */
mutex_lock(&ifmgd->mtx);
if ((ifmgd->auth_data && !ifmgd->auth_data->done) || if ((ifmgd->auth_data && !ifmgd->auth_data->done) ||
ifmgd->assoc_data) { ifmgd->assoc_data) {
err = -EBUSY; err = -EBUSY;
...@@ -4074,7 +3988,7 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata, ...@@ -4074,7 +3988,7 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
WLAN_REASON_UNSPECIFIED, WLAN_REASON_UNSPECIFIED,
false, frame_buf); false, frame_buf);
__cfg80211_send_deauth(sdata->dev, frame_buf, cfg80211_send_deauth(sdata->dev, frame_buf,
sizeof(frame_buf)); sizeof(frame_buf));
} }
...@@ -4092,8 +4006,7 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata, ...@@ -4092,8 +4006,7 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
/* hold our own reference */ /* hold our own reference */
cfg80211_ref_bss(local->hw.wiphy, auth_data->bss); cfg80211_ref_bss(local->hw.wiphy, auth_data->bss);
err = 0; return 0;
goto out_unlock;
err_clear: err_clear:
memset(ifmgd->bssid, 0, ETH_ALEN); memset(ifmgd->bssid, 0, ETH_ALEN);
...@@ -4101,9 +4014,6 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata, ...@@ -4101,9 +4014,6 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
ifmgd->auth_data = NULL; ifmgd->auth_data = NULL;
err_free: err_free:
kfree(auth_data); kfree(auth_data);
out_unlock:
mutex_unlock(&ifmgd->mtx);
return err; return err;
} }
...@@ -4134,8 +4044,6 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, ...@@ -4134,8 +4044,6 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
assoc_data->ssid_len = ssidie[1]; assoc_data->ssid_len = ssidie[1];
rcu_read_unlock(); rcu_read_unlock();
mutex_lock(&ifmgd->mtx);
if (ifmgd->associated) { if (ifmgd->associated) {
u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN]; u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN];
...@@ -4143,7 +4051,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, ...@@ -4143,7 +4051,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
WLAN_REASON_UNSPECIFIED, WLAN_REASON_UNSPECIFIED,
false, frame_buf); false, frame_buf);
__cfg80211_send_deauth(sdata->dev, frame_buf, cfg80211_send_deauth(sdata->dev, frame_buf,
sizeof(frame_buf)); sizeof(frame_buf));
} }
...@@ -4338,7 +4246,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, ...@@ -4338,7 +4246,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
} }
rcu_read_unlock(); rcu_read_unlock();
run_again(ifmgd, assoc_data->timeout); run_again(sdata, assoc_data->timeout);
if (bss->corrupt_data) { if (bss->corrupt_data) {
char *corrupt_type = "data"; char *corrupt_type = "data";
...@@ -4354,17 +4262,13 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, ...@@ -4354,17 +4262,13 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
corrupt_type); corrupt_type);
} }
err = 0; return 0;
goto out;
err_clear: err_clear:
memset(ifmgd->bssid, 0, ETH_ALEN); memset(ifmgd->bssid, 0, ETH_ALEN);
ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BSSID); ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BSSID);
ifmgd->assoc_data = NULL; ifmgd->assoc_data = NULL;
err_free: err_free:
kfree(assoc_data); kfree(assoc_data);
out:
mutex_unlock(&ifmgd->mtx);
return err; return err;
} }
...@@ -4376,8 +4280,6 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata, ...@@ -4376,8 +4280,6 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
bool tx = !req->local_state_change; bool tx = !req->local_state_change;
bool report_frame = false; bool report_frame = false;
mutex_lock(&ifmgd->mtx);
sdata_info(sdata, sdata_info(sdata,
"deauthenticating from %pM by local choice (reason=%d)\n", "deauthenticating from %pM by local choice (reason=%d)\n",
req->bssid, req->reason_code); req->bssid, req->reason_code);
...@@ -4389,7 +4291,6 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata, ...@@ -4389,7 +4291,6 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
req->reason_code, tx, req->reason_code, tx,
frame_buf); frame_buf);
ieee80211_destroy_auth_data(sdata, false); ieee80211_destroy_auth_data(sdata, false);
mutex_unlock(&ifmgd->mtx);
report_frame = true; report_frame = true;
goto out; goto out;
...@@ -4401,11 +4302,10 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata, ...@@ -4401,11 +4302,10 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
req->reason_code, tx, frame_buf); req->reason_code, tx, frame_buf);
report_frame = true; report_frame = true;
} }
mutex_unlock(&ifmgd->mtx);
out: out:
if (report_frame) if (report_frame)
__cfg80211_send_deauth(sdata->dev, frame_buf, cfg80211_send_deauth(sdata->dev, frame_buf,
IEEE80211_DEAUTH_FRAME_LEN); IEEE80211_DEAUTH_FRAME_LEN);
return 0; return 0;
...@@ -4418,18 +4318,14 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata, ...@@ -4418,18 +4318,14 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata,
u8 bssid[ETH_ALEN]; u8 bssid[ETH_ALEN];
u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN]; u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN];
mutex_lock(&ifmgd->mtx);
/* /*
* cfg80211 should catch this ... but it's racy since * cfg80211 should catch this ... but it's racy since
* we can receive a disassoc frame, process it, hand it * we can receive a disassoc frame, process it, hand it
* to cfg80211 while that's in a locked section already * to cfg80211 while that's in a locked section already
* trying to tell us that the user wants to disconnect. * trying to tell us that the user wants to disconnect.
*/ */
if (ifmgd->associated != req->bss) { if (ifmgd->associated != req->bss)
mutex_unlock(&ifmgd->mtx);
return -ENOLINK; return -ENOLINK;
}
sdata_info(sdata, sdata_info(sdata,
"disassociating from %pM by local choice (reason=%d)\n", "disassociating from %pM by local choice (reason=%d)\n",
...@@ -4439,9 +4335,8 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata, ...@@ -4439,9 +4335,8 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata,
ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DISASSOC, ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DISASSOC,
req->reason_code, !req->local_state_change, req->reason_code, !req->local_state_change,
frame_buf); frame_buf);
mutex_unlock(&ifmgd->mtx);
__cfg80211_send_disassoc(sdata->dev, frame_buf, cfg80211_send_disassoc(sdata->dev, frame_buf,
IEEE80211_DEAUTH_FRAME_LEN); IEEE80211_DEAUTH_FRAME_LEN);
return 0; return 0;
...@@ -4462,13 +4357,13 @@ void ieee80211_mgd_stop(struct ieee80211_sub_if_data *sdata) ...@@ -4462,13 +4357,13 @@ void ieee80211_mgd_stop(struct ieee80211_sub_if_data *sdata)
cancel_work_sync(&ifmgd->csa_connection_drop_work); cancel_work_sync(&ifmgd->csa_connection_drop_work);
cancel_work_sync(&ifmgd->chswitch_work); cancel_work_sync(&ifmgd->chswitch_work);
mutex_lock(&ifmgd->mtx); sdata_lock(sdata);
if (ifmgd->assoc_data) if (ifmgd->assoc_data)
ieee80211_destroy_assoc_data(sdata, false); ieee80211_destroy_assoc_data(sdata, false);
if (ifmgd->auth_data) if (ifmgd->auth_data)
ieee80211_destroy_auth_data(sdata, false); ieee80211_destroy_auth_data(sdata, false);
del_timer_sync(&ifmgd->timer); del_timer_sync(&ifmgd->timer);
mutex_unlock(&ifmgd->mtx); sdata_unlock(sdata);
} }
void ieee80211_cqm_rssi_notify(struct ieee80211_vif *vif, void ieee80211_cqm_rssi_notify(struct ieee80211_vif *vif,
......
net/mac80211/util.c
View file @ 8d61ffa5
...@@ -1581,9 +1581,9 @@ int ieee80211_reconfig(struct ieee80211_local *local) ...@@ -1581,9 +1581,9 @@ int ieee80211_reconfig(struct ieee80211_local *local)
if (sdata->u.mgd.dtim_period) if (sdata->u.mgd.dtim_period)
changed |= BSS_CHANGED_DTIM_PERIOD; changed |= BSS_CHANGED_DTIM_PERIOD;
mutex_lock(&sdata->u.mgd.mtx); sdata_lock(sdata);
ieee80211_bss_info_change_notify(sdata, changed); ieee80211_bss_info_change_notify(sdata, changed);
mutex_unlock(&sdata->u.mgd.mtx); sdata_unlock(sdata);
break; break;
case NL80211_IFTYPE_ADHOC: case NL80211_IFTYPE_ADHOC:
changed |= BSS_CHANGED_IBSS; changed |= BSS_CHANGED_IBSS;
......
net/wireless/mlme.c
View file @ 8d61ffa5
...@@ -25,12 +25,9 @@ void cfg80211_send_rx_auth(struct net_device *dev, const u8 *buf, size_t len) ...@@ -25,12 +25,9 @@ void cfg80211_send_rx_auth(struct net_device *dev, const u8 *buf, size_t len)
struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy); struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
trace_cfg80211_send_rx_auth(dev); trace_cfg80211_send_rx_auth(dev);
wdev_lock(wdev);
nl80211_send_rx_auth(rdev, dev, buf, len, GFP_KERNEL); nl80211_send_rx_auth(rdev, dev, buf, len, GFP_KERNEL);
cfg80211_sme_rx_auth(dev, buf, len); cfg80211_sme_rx_auth(dev, buf, len);
wdev_unlock(wdev);
} }
EXPORT_SYMBOL(cfg80211_send_rx_auth); EXPORT_SYMBOL(cfg80211_send_rx_auth);
...@@ -46,7 +43,6 @@ void cfg80211_send_rx_assoc(struct net_device *dev, struct cfg80211_bss *bss, ...@@ -46,7 +43,6 @@ void cfg80211_send_rx_assoc(struct net_device *dev, struct cfg80211_bss *bss,
int ieoffs = offsetof(struct ieee80211_mgmt, u.assoc_resp.variable); int ieoffs = offsetof(struct ieee80211_mgmt, u.assoc_resp.variable);
trace_cfg80211_send_rx_assoc(dev, bss); trace_cfg80211_send_rx_assoc(dev, bss);
wdev_lock(wdev);
status_code = le16_to_cpu(mgmt->u.assoc_resp.status_code); status_code = le16_to_cpu(mgmt->u.assoc_resp.status_code);
...@@ -59,7 +55,7 @@ void cfg80211_send_rx_assoc(struct net_device *dev, struct cfg80211_bss *bss, ...@@ -59,7 +55,7 @@ void cfg80211_send_rx_assoc(struct net_device *dev, struct cfg80211_bss *bss,
if (status_code != WLAN_STATUS_SUCCESS && wdev->conn && if (status_code != WLAN_STATUS_SUCCESS && wdev->conn &&
cfg80211_sme_failed_reassoc(wdev)) { cfg80211_sme_failed_reassoc(wdev)) {
cfg80211_put_bss(wiphy, bss); cfg80211_put_bss(wiphy, bss);
goto out; return;
} }
nl80211_send_rx_assoc(rdev, dev, buf, len, GFP_KERNEL); nl80211_send_rx_assoc(rdev, dev, buf, len, GFP_KERNEL);
...@@ -71,7 +67,7 @@ void cfg80211_send_rx_assoc(struct net_device *dev, struct cfg80211_bss *bss, ...@@ -71,7 +67,7 @@ void cfg80211_send_rx_assoc(struct net_device *dev, struct cfg80211_bss *bss,
* sme will schedule work that does it later. * sme will schedule work that does it later.
*/ */
cfg80211_put_bss(wiphy, bss); cfg80211_put_bss(wiphy, bss);
goto out; return;
} }
if (!wdev->conn && wdev->sme_state == CFG80211_SME_IDLE) { if (!wdev->conn && wdev->sme_state == CFG80211_SME_IDLE) {
...@@ -87,12 +83,10 @@ void cfg80211_send_rx_assoc(struct net_device *dev, struct cfg80211_bss *bss, ...@@ -87,12 +83,10 @@ void cfg80211_send_rx_assoc(struct net_device *dev, struct cfg80211_bss *bss,
__cfg80211_connect_result(dev, mgmt->bssid, NULL, 0, ie, len - ieoffs, __cfg80211_connect_result(dev, mgmt->bssid, NULL, 0, ie, len - ieoffs,
status_code, status_code,
status_code == WLAN_STATUS_SUCCESS, bss); status_code == WLAN_STATUS_SUCCESS, bss);
out:
wdev_unlock(wdev);
} }
EXPORT_SYMBOL(cfg80211_send_rx_assoc); EXPORT_SYMBOL(cfg80211_send_rx_assoc);
void __cfg80211_send_deauth(struct net_device *dev, void cfg80211_send_deauth(struct net_device *dev,
const u8 *buf, size_t len) const u8 *buf, size_t len)
{ {
struct wireless_dev *wdev = dev->ieee80211_ptr; struct wireless_dev *wdev = dev->ieee80211_ptr;
...@@ -102,7 +96,7 @@ void __cfg80211_send_deauth(struct net_device *dev, ...@@ -102,7 +96,7 @@ void __cfg80211_send_deauth(struct net_device *dev,
const u8 *bssid = mgmt->bssid; const u8 *bssid = mgmt->bssid;
bool was_current = false; bool was_current = false;
trace___cfg80211_send_deauth(dev); trace_cfg80211_send_deauth(dev);
ASSERT_WDEV_LOCK(wdev); ASSERT_WDEV_LOCK(wdev);
if (wdev->current_bss && if (wdev->current_bss &&
...@@ -129,19 +123,9 @@ void __cfg80211_send_deauth(struct net_device *dev, ...@@ -129,19 +123,9 @@ void __cfg80211_send_deauth(struct net_device *dev,
false, NULL); false, NULL);
} }
} }
EXPORT_SYMBOL(__cfg80211_send_deauth);
void cfg80211_send_deauth(struct net_device *dev, const u8 *buf, size_t len)
{
struct wireless_dev *wdev = dev->ieee80211_ptr;
wdev_lock(wdev);
__cfg80211_send_deauth(dev, buf, len);
wdev_unlock(wdev);
}
EXPORT_SYMBOL(cfg80211_send_deauth); EXPORT_SYMBOL(cfg80211_send_deauth);
void __cfg80211_send_disassoc(struct net_device *dev, void cfg80211_send_disassoc(struct net_device *dev,
const u8 *buf, size_t len) const u8 *buf, size_t len)
{ {
struct wireless_dev *wdev = dev->ieee80211_ptr; struct wireless_dev *wdev = dev->ieee80211_ptr;
...@@ -152,7 +136,7 @@ void __cfg80211_send_disassoc(struct net_device *dev, ...@@ -152,7 +136,7 @@ void __cfg80211_send_disassoc(struct net_device *dev,
u16 reason_code; u16 reason_code;
bool from_ap; bool from_ap;
trace___cfg80211_send_disassoc(dev); trace_cfg80211_send_disassoc(dev);
ASSERT_WDEV_LOCK(wdev); ASSERT_WDEV_LOCK(wdev);
nl80211_send_disassoc(rdev, dev, buf, len, GFP_KERNEL); nl80211_send_disassoc(rdev, dev, buf, len, GFP_KERNEL);
...@@ -175,16 +159,6 @@ void __cfg80211_send_disassoc(struct net_device *dev, ...@@ -175,16 +159,6 @@ void __cfg80211_send_disassoc(struct net_device *dev,
from_ap = !ether_addr_equal(mgmt->sa, dev->dev_addr); from_ap = !ether_addr_equal(mgmt->sa, dev->dev_addr);
__cfg80211_disconnected(dev, NULL, 0, reason_code, from_ap); __cfg80211_disconnected(dev, NULL, 0, reason_code, from_ap);
} }
EXPORT_SYMBOL(__cfg80211_send_disassoc);
void cfg80211_send_disassoc(struct net_device *dev, const u8 *buf, size_t len)
{
struct wireless_dev *wdev = dev->ieee80211_ptr;
wdev_lock(wdev);
__cfg80211_send_disassoc(dev, buf, len);
wdev_unlock(wdev);
}
EXPORT_SYMBOL(cfg80211_send_disassoc); EXPORT_SYMBOL(cfg80211_send_disassoc);
void cfg80211_send_auth_timeout(struct net_device *dev, const u8 *addr) void cfg80211_send_auth_timeout(struct net_device *dev, const u8 *addr)
...@@ -194,15 +168,12 @@ void cfg80211_send_auth_timeout(struct net_device *dev, const u8 *addr) ...@@ -194,15 +168,12 @@ void cfg80211_send_auth_timeout(struct net_device *dev, const u8 *addr)
struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy); struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
trace_cfg80211_send_auth_timeout(dev, addr); trace_cfg80211_send_auth_timeout(dev, addr);
wdev_lock(wdev);
nl80211_send_auth_timeout(rdev, dev, addr, GFP_KERNEL); nl80211_send_auth_timeout(rdev, dev, addr, GFP_KERNEL);
if (wdev->sme_state == CFG80211_SME_CONNECTING) if (wdev->sme_state == CFG80211_SME_CONNECTING)
__cfg80211_connect_result(dev, addr, NULL, 0, NULL, 0, __cfg80211_connect_result(dev, addr, NULL, 0, NULL, 0,
WLAN_STATUS_UNSPECIFIED_FAILURE, WLAN_STATUS_UNSPECIFIED_FAILURE,
false, NULL); false, NULL);
wdev_unlock(wdev);
} }
EXPORT_SYMBOL(cfg80211_send_auth_timeout); EXPORT_SYMBOL(cfg80211_send_auth_timeout);
...@@ -213,15 +184,12 @@ void cfg80211_send_assoc_timeout(struct net_device *dev, const u8 *addr) ...@@ -213,15 +184,12 @@ void cfg80211_send_assoc_timeout(struct net_device *dev, const u8 *addr)
struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy); struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
trace_cfg80211_send_assoc_timeout(dev, addr); trace_cfg80211_send_assoc_timeout(dev, addr);
wdev_lock(wdev);
nl80211_send_assoc_timeout(rdev, dev, addr, GFP_KERNEL); nl80211_send_assoc_timeout(rdev, dev, addr, GFP_KERNEL);
if (wdev->sme_state == CFG80211_SME_CONNECTING) if (wdev->sme_state == CFG80211_SME_CONNECTING)
__cfg80211_connect_result(dev, addr, NULL, 0, NULL, 0, __cfg80211_connect_result(dev, addr, NULL, 0, NULL, 0,
WLAN_STATUS_UNSPECIFIED_FAILURE, WLAN_STATUS_UNSPECIFIED_FAILURE,
false, NULL); false, NULL);
wdev_unlock(wdev);
} }
EXPORT_SYMBOL(cfg80211_send_assoc_timeout); EXPORT_SYMBOL(cfg80211_send_assoc_timeout);
......
net/wireless/trace.h
View file @ 8d61ffa5
...@@ -1911,12 +1911,12 @@ TRACE_EVENT(cfg80211_send_rx_assoc, ...@@ -1911,12 +1911,12 @@ TRACE_EVENT(cfg80211_send_rx_assoc,
NETDEV_PR_ARG, MAC_PR_ARG(bssid), CHAN_PR_ARG) NETDEV_PR_ARG, MAC_PR_ARG(bssid), CHAN_PR_ARG)
); );
DEFINE_EVENT(netdev_evt_only, __cfg80211_send_deauth, DEFINE_EVENT(netdev_evt_only, cfg80211_send_deauth,
TP_PROTO(struct net_device *netdev), TP_PROTO(struct net_device *netdev),
TP_ARGS(netdev) TP_ARGS(netdev)
); );
DEFINE_EVENT(netdev_evt_only, __cfg80211_send_disassoc, DEFINE_EVENT(netdev_evt_only, cfg80211_send_disassoc,
TP_PROTO(struct net_device *netdev), TP_PROTO(struct net_device *netdev),
TP_ARGS(netdev) TP_ARGS(netdev)
); );
......
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