Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b365834 authored by Javier Cardona's avatar Javier Cardona Committed by John W. Linville
Browse files

mac80211: Assign a default mesh beaconing interval. 



The mesh stack was enabling beaconing without specifying an interval.  This
patch defines a default beaconing interval of 1s.

Incidentally, this fixes mesh beaconing in mac80211_hwsim devices.

Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5815814b

net/mac80211/mesh.c

+4 −2
Original line number Diff line number Diff line
@@ -525,9 +525,11 @@ void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata) 
	struct ieee80211_local *local = sdata->local;



	ifmsh->housekeeping = true;

	ieee80211_queue_work(&local->hw, &ifmsh->work);

	queue_work(local->hw, &ifmsh->work);

	sdata->vif.bss_conf.beacon_int = MESH_DEFAULT_BEACON_INTERVAL;

	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON |

						BSS_CHANGED_BEACON_ENABLED);

						BSS_CHANGED_BEACON_ENABLED |

						BSS_CHANGED_BEACON_INT);

}



void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata)

net/mac80211/mesh.h

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ struct mesh_rmc { 
 */

#define MESH_PATH_REFRESH_TIME			1000

#define MESH_MIN_DISCOVERY_TIMEOUT (2 * MESH_DIAM_TRAVERSAL_TIME)

#define MESH_DEFAULT_BEACON_INTERVAL		1000 	/* in 1024 us units */



#define MESH_MAX_PREQ_RETRIES 4

#define MESH_PATH_EXPIRE (600 * HZ)