forked from luck/tmp_suning_uos_patched
mac80211: fix error path for TDLS setup
The patch "8f02e6b mac80211: make sure TDLS peer STA exists during setup" broke TDLS error paths where the STA doesn't exist when sending the error. Fix it by only testing for STA existence during a non-error flow. Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com> Reviewed-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
parent
626911cc60
commit
6ae32e5d28
@ -349,15 +349,19 @@ ieee80211_tdls_mgmt_setup(struct wiphy *wiphy, struct net_device *dev,
|
|||||||
/*
|
/*
|
||||||
* make sure we have a STA representing the peer so we drop or buffer
|
* make sure we have a STA representing the peer so we drop or buffer
|
||||||
* non-TDLS-setup frames to the peer. We can't send other packets
|
* non-TDLS-setup frames to the peer. We can't send other packets
|
||||||
* during setup through the AP path
|
* during setup through the AP path.
|
||||||
|
* Allow error packets to be sent - sometimes we don't even add a STA
|
||||||
|
* before failing the setup.
|
||||||
*/
|
*/
|
||||||
rcu_read_lock();
|
if (status_code == 0) {
|
||||||
if (!sta_info_get(sdata, peer)) {
|
rcu_read_lock();
|
||||||
|
if (!sta_info_get(sdata, peer)) {
|
||||||
|
rcu_read_unlock();
|
||||||
|
ret = -ENOLINK;
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
rcu_read_unlock();
|
rcu_read_unlock();
|
||||||
ret = -ENOLINK;
|
|
||||||
goto exit;
|
|
||||||
}
|
}
|
||||||
rcu_read_unlock();
|
|
||||||
|
|
||||||
ieee80211_flush_queues(local, sdata);
|
ieee80211_flush_queues(local, sdata);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user