Commit ac1bd846 authored Jan 18, 2011 by Johannes Berg Committed by John W. Linville Jan 19, 2011

mac80211: don't return beacons when mesh is disabled



When mesh is disabled, mac80211 was returning
beacons with an empty mesh ID. That isn't
desirable, even if drivers shouldn't be trying
to get beacons to start with.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 4801416c

net/mac80211/tx.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -2299,6 +2299,11 @@ struct sk_buff ieee80211_beacon_get_tim(struct ieee80211_hw hw,
		struct ieee80211_mgmt *mgmt;
		u8 *pos;

		#ifdef CONFIG_MAC80211_MESH
		if (!sdata->u.mesh.mesh_id_len)
		goto out;
		#endif

		/* headroom, head length, tail length and maximum TIM length */
		skb = dev_alloc_skb(local->tx_headroom + 400 +
		sdata->u.mesh.vendor_ie_len);