diff mbox

Mesh join/leave

Message ID 1294829180.3639.19.camel@jlt3.sipsolutions.net (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Johannes Berg Jan. 12, 2011, 10:46 a.m. UTC
None
diff mbox

Patch

--- wireless-testing.orig/net/mac80211/tx.c	2011-01-12 11:44:52.000000000 +0100
+++ wireless-testing/net/mac80211/tx.c	2011-01-12 11:45:52.000000000 +0100
@@ -2299,6 +2299,11 @@  struct sk_buff *ieee80211_beacon_get_tim
 		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);