diff options
| author | Thomas Pedersen <thomas@cozybit.com> | 2012-05-03 15:06:09 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-05-15 17:27:54 -0400 |
| commit | f5c5681424299add910aad86b01d6ffe7ca02c84 (patch) | |
| tree | fa1189f724083e6e5585affd6fa70c3f122794d7 | |
| parent | 8ff44ef26afc313af667ab48fc82b6e4d8bc525b (diff) | |
| download | linux-f5c5681424299add910aad86b01d6ffe7ca02c84.tar.gz linux-f5c5681424299add910aad86b01d6ffe7ca02c84.tar.bz2 linux-f5c5681424299add910aad86b01d6ffe7ca02c84.zip | |
mac80211: send peer candidate event for new sta only
Only send a cfg80211 new peer candidate notification if userspace has
yet to allocate this station entry.
Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | net/mac80211/mesh_plink.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index 8cc8461b48a0..ae026acec874 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c @@ -346,6 +346,15 @@ static struct sta_info *mesh_peer_init(struct ieee80211_sub_if_data *sdata, sta = sta_info_get(sdata, addr); if (!sta) { + /* Userspace handles peer allocation when security is enabled */ + if (sdata->u.mesh.security & IEEE80211_MESH_SEC_AUTHED) { + cfg80211_notify_new_peer_candidate(sdata->dev, addr, + elems->ie_start, + elems->total_len, + GFP_ATOMIC); + return NULL; + } + sta = mesh_plink_alloc(sdata, addr); if (!sta) return NULL; @@ -387,15 +396,6 @@ void mesh_neighbour_update(struct ieee80211_sub_if_data *sdata, { struct sta_info *sta; - /* Userspace handles peer allocation when security is enabled */ - if (sdata->u.mesh.security & IEEE80211_MESH_SEC_AUTHED) { - cfg80211_notify_new_peer_candidate(sdata->dev, hw_addr, - elems->ie_start, - elems->total_len, - GFP_KERNEL); - return; - } - rcu_read_lock(); sta = mesh_peer_init(sdata, hw_addr, elems); if (!sta) |