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

Commit 8b808bf2 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: assign conf.beacon_control for mesh 



Drivers can rightfully assume that they get a beacon_control
if the beacon is set.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 51ceddad

net/mac80211/main.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -975,6 +975,7 @@ static int __ieee80211_if_config(struct net_device *dev, 
		conf.ssid_len = sdata->u.sta.ssid_len;

		conf.ssid_len = sdata->u.sta.ssid_len;

	} else if (ieee80211_vif_is_mesh(&sdata->vif)) {

	} else if (ieee80211_vif_is_mesh(&sdata->vif)) {

		conf.beacon = beacon;

		conf.beacon = beacon;

		conf.beacon_control = control;

		ieee80211_start_mesh(dev);

		ieee80211_start_mesh(dev);

	} else if (sdata->vif.type == IEEE80211_IF_TYPE_AP) {

	} else if (sdata->vif.type == IEEE80211_IF_TYPE_AP) {

		conf.ssid = sdata->u.ap.ssid;

		conf.ssid = sdata->u.ap.ssid;