2016-06-28 11:15:55

by Yaniv Machani

Subject: [PATCH] mac80211: util: mesh is not connected properly after recovery

From: Maital Hahn <[email protected]>

In the reconfigure process for mesh interface, moved the reconfiguration
of the mesh peers to be done only after restarting the beacons,
the same as it is done for AP.

Signed-off-by: Maital Hahn <[email protected]>
Acked-by: Yaniv Machani <[email protected]>
---
net/mac80211/util.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 5375a82..2431684 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1910,6 +1910,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
ieee80211_reconfig_stations(sdata);
/* fall through */
case NL80211_IFTYPE_AP: /* AP stations are handled later */
+ case NL80211_IFTYPE_MESH_POINT: /* MP peers are handled later */
for (i = 0; i < IEEE80211_NUM_ACS; i++)
drv_conf_tx(local, sdata, i,
&sdata->tx_conf[i]);
@@ -2013,7 +2014,8 @@ int ieee80211_reconfig(struct ieee80211_local *local)
if (!sta->uploaded)
continue;

- if (sta->sdata->vif.type != NL80211_IFTYPE_AP)
+ if ((sta->sdata->vif.type != NL80211_IFTYPE_AP) &&
+ (sta->sdata->vif.type != NL80211_IFTYPE_MESH_POINT))
continue;

for (state = IEEE80211_STA_NOTEXIST;
--
2.9.0

2016-06-29 07:20:35

by Johannes Berg

Subject: Re: [PATCH] mac80211: util: mesh is not connected properly after recovery

Also - your subject lines should explain the *fix*, not the *bug*

johannes

2016-06-29 07:20:12

by Johannes Berg

Subject: Re: [PATCH] mac80211: util: mesh is not connected properly after recovery

On Tue, 2016-06-28 at 14:15 +0300, Yaniv Machani wrote:
> From: Maital Hahn <[email protected]>
>
> In the reconfigure process for mesh interface, moved the
> reconfiguration
> of the mesh peers to be done only after restarting the beacons,
> the same as it is done for AP.
>
> Signed-off-by: Maital Hahn <[email protected]>
> Acked-by: Yaniv Machani <[email protected]>
>
Same here, and this also needs a description of why this is OK with
other drivers, since presumably it already works there.

johannes