[PATCH v3] mac80211: keep sending peer candidate events while in listen state

[PATCH v3] mac80211: keep sending peer candidate events while in listen state

[Nishikawa, Kenzoh]

Instead of sending peer candidate events just once, send them as long as the peer remains in the LISTEN state in the peering state machine, when userspace is implementing the peering manager.  Userspace may silence the events from a peer by progressing the state machine or by setting the link state to BLOCKED.

Fixes the problem that a mesh peering process won't be fired again after the previous first peering trial fails due to like air propagation error if the peering is managed by user space such as wpa_supplicant.

This patch works with another patch for wpa_supplicant described here which fires a peering process again triggered by the notice from kernel.
http://lists.shmoo.com/pipermail/hostap/2014-November/031235.html

Signed-off-by: Kenzoh Nishikawa <Kenzoh.Nishikawa at jp.sony.com>
---
net/mac80211/mesh_plink.c |    7 +++++++
1 file changed, 7 insertions(+)

diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index 32c7bd0..dfc429b 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -524,6 +524,13 @@ void mesh_neighbour_update(struct ieee80211_sub_if_data *sdata,
 	    sdata->u.mesh.mshcfg.auto_open_plinks &&
 	    rssi_threshold_check(sta, sdata))
 		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:

Re: [PATCH v3] mac80211: keep sending peer candidate events while in listen state

[Johannes Berg]

On Fri, 2014-11-21 at 09:11 +0000, Nishikawa, Kenzoh wrote:
> Instead of sending peer candidate events just once, send them as long as the peer remains in the LISTEN state in the peering state machine, when userspace is implementing the peering manager.  Userspace may silence the events from a peer by progressing the state machine or by setting the link state to BLOCKED.
> 
> Fixes the problem that a mesh peering process won't be fired again after the previous first peering trial fails due to like air propagation error if the peering is managed by user space such as wpa_supplicant.
> 
> This patch works with another patch for wpa_supplicant described here which fires a peering process again triggered by the notice from kernel.
> http://lists.shmoo.com/pipermail/hostap/2014-November/031235.html

Please break those long lines to <72 characters.


> +	else if (sta->plink_state == NL80211_PLINK_LISTEN &&
> +		(sdata->u.mesh.user_mpm ||
> +		sdata->u.mesh.security & IEEE80211_MESH_SEC_AUTHED))

the latter two lines should be indented by one more space

johannes

Re: [PATCH v3] mac80211: keep sending peer candidate events while in listen state

[Johannes Berg]

On Fri, 2014-11-21 at 10:47 +0100, Johannes Berg wrote:

> > +	else if (sta->plink_state == NL80211_PLINK_LISTEN &&
> > +		(sdata->u.mesh.user_mpm ||
> > +		sdata->u.mesh.security & IEEE80211_MESH_SEC_AUTHED))
> 
> the latter two lines should be indented by one more space

Actually the third by 2 to match the containing parenthesis.

johannes