commit 2154c81c32fa44364f83218a10d8dbec4e76d4f5
author Javier Cardona <javier@cozybit.com> Wed Sep 07 17:49:53 2011 -0700
committer John W. Linville <linville@tuxdriver.com> Wed Sep 14 13:56:50 2011 -0400
tree d51234e55d24c6ff5f4849d2757b57f1d6accaac
parent 4777be41638cfab56c78b2a764a5f83beb6cfdd2

mac80211: Mesh data frames must have the QoS header

Per sec 7.1.3.5 of draft 12.0 of 802.11s, mesh frames indicate the
presence of the mesh control header in their QoS header.

Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

net/mac80211/mesh.c

diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 65acbf5..a4225ae 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -463,8 +463,7 @@
 		memcpy(hdr->addr3, meshsa, ETH_ALEN);
 		return 24;
 	} else {
-		*fc |= cpu_to_le16(IEEE80211_FCTL_FROMDS |
-				IEEE80211_FCTL_TODS);
+		*fc |= cpu_to_le16(IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS);
 		/* RA TA DA SA */
 		memset(hdr->addr1, 0, ETH_ALEN);   /* RA is resolved later */
 		memcpy(hdr->addr2, meshsa, ETH_ALEN);