From: Yuri Ershov <ext-yuri.ershov@nokia.com>
Date: Tue, 29 Jun 2010 11:08:06 +0000 (+0400)
Subject: mac80211: Put some code under MESH macro
X-Git-Tag: 2.1b_release~7593^2~64^2~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4ab7eb0aecbe56ac280486c61cd3f0f6c42870b;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

mac80211: Put some code under MESH macro

In the function ieee80211_subif_start_xmit the logic related with
meshdrlen is under CONFIG_MAC80211_MESH macro, but in one place it isn't.
This is some update for this

Signed-off-by: Yuri Ershov <ext-yuri.ershov@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 2f8182d..c54db96 100644
--- a/net/mac80211/tx.c
+++ b/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;