Javier,
> Looks good from this end, including the new iw commands.
Thanks!
> The only
> issue that we observed is that now that we can leave and join a new
> mesh, we need to do some more state cleanup on stop_mesh. Otherwise
> we could move to a new mesh and still talk to the previous peers. I
> think this would be sufficient:
>
> diff --git a/net/mac80211/main.c b/net/mac80211/main.c
> index 107a0cb..b1242b6 100644
> --- a/net/mac80211/main.c
> +++ b/net/mac80211/main.c
> @@ -246,7 +246,6 @@ void ieee80211_bss_info_change_notify(struct
> ieee80211_sub_if_data *sdata,
> !!sdata->u.ibss.presp;
> break;
> case NL80211_IFTYPE_MESH_POINT:
> - sdata->vif.bss_conf.enable_beacon = true;
> break;
> default:
Oh, indeed. I think this should be
sdata->vif.bss_conf.enable_beacon = !!mesh_id_len;
though.
> diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
> index d814fab..cc458dd 100644
> --- a/net/mac80211/mesh.c
> +++ b/net/mac80211/mesh.c
> @@ -522,6 +522,7 @@ void ieee80211_start_mesh(struct
> ieee80211_sub_if_data *sdata)
> ieee80211_mesh_root_setup(ifmsh);
> ieee80211_queue_work(&local->hw, &sdata->work);
> sdata->vif.bss_conf.beacon_int = MESH_DEFAULT_BEACON_INTERVAL;
> + sdata->vif.bss_conf.enable_beacon = true;
Because otherwise, if you just do this, scanning will stop beaconing
forever...
> ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON |
> BSS_CHANGED_BEACON_ENABLED |
> BSS_CHANGED_BEACON_INT);
> @@ -530,6 +531,13 @@ void ieee80211_start_mesh(struct
> ieee80211_sub_if_data *sdata)
> void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata)
> {
> struct ieee80211_local *local = sdata->local;
> + struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
> +
> + ifmsh->mesh_id_len = 0;
Yeah good catch.
> + memset(ifmsh->mesh_id, 0, IEEE80211_MAX_MESH_ID_LEN);
That shouldn't really be necessary.
> + sdata->vif.bss_conf.enable_beacon = false;
Nor would that with the change I proposed, I think.
> + ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);
> + sta_info_flush(local, NULL);
Yup, good changes.
Would you mind briefly testing the beacon change I proposed above?
johannes
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
