From e5871d0ef49e932c8fbf9261e702636e2bb8b014 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 18 Jan 2011 13:45:32 +0100
Subject: [PATCH] --- yaml --- r: 236741 b: refs/heads/master c:
 ac1bd8464f161ed1475ef73c431b926256c6b5bb h: refs/heads/master i:   236739:
 c0c714b140de8335ba0ecbb9fea84b372d1d33f0 v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/tx.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2b88be16ec5a..026b5326cb20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4801416c76a3a355076d6d371c00270dfe332e1c
+refs/heads/master: ac1bd8464f161ed1475ef73c431b926256c6b5bb
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index 2378305f7534..e46c801320e1 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -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);