diff options
| author | Masashi Honma <masashi.honma@gmail.com> | 2016-11-30 01:06:04 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2016-12-13 16:05:11 +0100 |
| commit | 11197d006bcfabf0173a7820a163fcaac420d10e (patch) | |
| tree | 3af7999c1e3a29f2ab777935fbceaa2562e58574 /net | |
| parent | mac80211: multicast to unicast conversion (diff) | |
| download | linux-11197d006bcfabf0173a7820a163fcaac420d10e.tar.xz linux-11197d006bcfabf0173a7820a163fcaac420d10e.zip | |
mac80211: Suppress NEW_PEER_CANDIDATE event if no room
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/mesh_plink.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index 7fcdcf622655..fcba70e57073 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c @@ -505,12 +505,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; |