| Message ID | 1421963393-3275-1-git-send-email-me@bobcopeland.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Johannes Berg |
| Headers | show |
On Thu, 2015-01-22 at 16:49 -0500, Bob Copeland wrote: > This reverts commit 2ae70efcea7a695a62bb47170d3fb16674b8dbea. > > The new peer events that are generated by the change are causing problems > with wpa_supplicant in userspace: wpa_s tries to restart SAE authentication > with the peer when receiving the event, even though authentication may be in > progress already, and it gets very confused. > > Revert back to the original operating mode, which is to only get events when > there is no corresponding station entry. Applied. johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index fa94ca1..b488e18 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c @@ -523,13 +523,6 @@ void mesh_neighbour_update(struct ieee80211_sub_if_data *sdata, sdata->u.mesh.mshcfg.auto_open_plinks && rssi_threshold_check(sdata, sta)) changed = mesh_plink_open(sta); - else if (sta->plink_state == NL80211_PLINK_LISTEN && - (sdata->u.mesh.user_mpm || - sdata->u.mesh.security & IEEE80211_MESH_SEC_AUTHED)) - cfg80211_notify_new_peer_candidate(sdata->dev, hw_addr, - elems->ie_start, - elems->total_len, - GFP_ATOMIC); ieee80211_mps_frame_release(sta, elems); out:
This reverts commit 2ae70efcea7a695a62bb47170d3fb16674b8dbea. The new peer events that are generated by the change are causing problems with wpa_supplicant in userspace: wpa_s tries to restart SAE authentication with the peer when receiving the event, even though authentication may be in progress already, and it gets very confused. Revert back to the original operating mode, which is to only get events when there is no corresponding station entry. Cc: Nishikawa, Kenzoh <Kenzoh.Nishikawa@jp.sony.com> Cc: Masashi Honma <masashi.honma@gmail.com> Signed-off-by: Bob Copeland <me@bobcopeland.com> --- As for the original patch purpose, I think the right thing to do is just run a timer in userspace to restart peering for open mesh (we already have something like this for AMPE). If peering doesn't complete after a few tries, either mark it blocked or just delete the station and start getting events again, if the peer is in fact alive. net/mac80211/mesh_plink.c | 7 ------- 1 file changed, 7 deletions(-)