mac80211: Suppress NEW_PEER_CANDIDATE event if no room

[ Upstream commit 11197d006bcfabf0173a7820a163fcaac420d10e ]

Previously, kernel sends NEW_PEER_CANDIDATE event to user land even if
the found peer does not have any room to accept other peer. This causes
continuous connection trials.

Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>

diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index 60d737f144e37563ebfaa9f7c82efafc3e2c9135..7f758c9aa2002ee72f73f771b2145e1be21065d9 100644 (file)
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -452,12 +452,14 @@ mesh_sta_info_alloc(struct ieee80211_sub_if_data *sdata, u8 *addr,
 
        /* Userspace handles station allocation */
        if (sdata->u.mesh.user_mpm ||
-           sdata->u.mesh.security & IEEE80211_MESH_SEC_AUTHED)
-               cfg80211_notify_new_peer_candidate(sdata->dev, addr,
-                                                  elems->ie_start,
-                                                  elems->total_len,
-                                                  GFP_KERNEL);
-       else
+           sdata->u.mesh.security & IEEE80211_MESH_SEC_AUTHED) {
+               if (mesh_peer_accepts_plinks(elems) &&
+                   mesh_plink_availables(sdata))
+                       cfg80211_notify_new_peer_candidate(sdata->dev, addr,
+                                                          elems->ie_start,
+                                                          elems->total_len,
+                                                          GFP_KERNEL);
+       } else
                sta = __mesh_sta_info_alloc(sdata, addr);
 
        return sta;