From 1d4502cd8bc8fd45980e7441dfdaa59f601e21c5 Mon Sep 17 00:00:00 2001
From: Yuri Ershov <ext-yuri.ershov@nokia.com>
Date: Tue, 29 Jun 2010 15:08:06 +0400
Subject: [PATCH] --- yaml --- r: 203925 b: refs/heads/master c:
 e4ab7eb0aecbe56ac280486c61cd3f0f6c42870b h: refs/heads/master i:   203923:
 9e796459a6ca286ab5c2d0e727bbbce6173d2096 v: v3

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

diff --git a/[refs] b/[refs]
index 86cea927163d..d679a888da8d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 099284bdecf6e0af78662371ed3f45b71d796aad
+refs/heads/master: e4ab7eb0aecbe56ac280486c61cd3f0f6c42870b
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index 2f8182dc94a1..c54db966926b 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -1935,11 +1935,13 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
 		h_pos += encaps_len;
 	}
 
+#ifdef CONFIG_MAC80211_MESH
 	if (meshhdrlen > 0) {
 		memcpy(skb_push(skb, meshhdrlen), &mesh_hdr, meshhdrlen);
 		nh_pos += meshhdrlen;
 		h_pos += meshhdrlen;
 	}
+#endif
 
 	if (ieee80211_is_data_qos(fc)) {
 		__le16 *qos_control;