summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorYuri Ershov <ext-yuri.ershov@nokia.com>2010-06-29 15:08:06 +0400
committerJohn W. Linville <linville@tuxdriver.com>2010-07-29 00:24:01 +0400
commite4ab7eb0aecbe56ac280486c61cd3f0f6c42870b (patch)
tree10a03d37bc640f1c572541806e2a6541b5ea019b /net
parent099284bdecf6e0af78662371ed3f45b71d796aad (diff)
downloadlinux-e4ab7eb0aecbe56ac280486c61cd3f0f6c42870b.tar.xz
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>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/tx.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 2f8182dc94a1..c54db966926b 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;