diff options
| author | Arik Nemtsov <arik@wizery.com> | 2014-07-17 17:14:18 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-07-21 12:14:03 +0200 |
| commit | 6ae32e5d284a5db589bfa63561932ad3306f538a (patch) | |
| tree | 2588c0f8a658032d120d97d0ec8339e411ebe689 /net | |
| parent | 626911cc60d873b38f7ca4c5c537fcb918c658d7 (diff) | |
| download | op-kernel-dev-6ae32e5d284a5db589bfa63561932ad3306f538a.zip op-kernel-dev-6ae32e5d284a5db589bfa63561932ad3306f538a.tar.gz | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/tdls.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/net/mac80211/tdls.c b/net/mac80211/tdls.c index b01b310..53c235d 100644 --- a/net/mac80211/tdls.c +++ b/net/mac80211/tdls.c @@ -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 * 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 (!sta_info_get(sdata, peer)) { + if (status_code == 0) { + rcu_read_lock(); + if (!sta_info_get(sdata, peer)) { + rcu_read_unlock(); + ret = -ENOLINK; + goto exit; + } rcu_read_unlock(); - ret = -ENOLINK; - goto exit; } - rcu_read_unlock(); ieee80211_flush_queues(local, sdata); |
