1 files changed, 5 insertions, 4 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 4d458067d80d..111c400199ec 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1546,6 +1546,11 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
         if (is_multicast_ether_addr(mac))
                 return -EINVAL;
 
+        if (params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER) &&
+            sdata->vif.type == NL80211_IFTYPE_STATION &&
+            !sdata->u.mgd.associated)
+                return -EINVAL;
+
         sta = sta_info_alloc(sdata, mac, GFP_KERNEL);
         if (!sta)
                 return -ENOMEM;
@@ -1553,10 +1558,6 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
         if (params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER))
                 sta->sta.tdls = true;
 
-        if (sta->sta.tdls && sdata->vif.type == NL80211_IFTYPE_STATION &&
-            !sdata->u.mgd.associated)
-                return -EINVAL;
-
         err = sta_apply_parameters(local, sta, params);
         if (err) {
                 sta_info_free(local, sta);