diff options
| author | Javier Cardona | 2011-09-08 02:49:53 +0200 |
|---|---|---|
| committer | John W. Linville | 2011-09-14 19:56:50 +0200 |
| commit | 2154c81c32fa44364f83218a10d8dbec4e76d4f5 (patch) | |
| tree | d51234e55d24c6ff5f4849d2757b57f1d6accaac /net/mac80211/mesh.c | |
| parent | mac80211: Start implementing QoS support for mesh interfaces (diff) | |
| download | kernel-qcow2-linux-2154c81c32fa44364f83218a10d8dbec4e76d4f5.tar.gz kernel-qcow2-linux-2154c81c32fa44364f83218a10d8dbec4e76d4f5.tar.xz kernel-qcow2-linux-2154c81c32fa44364f83218a10d8dbec4e76d4f5.zip | |
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>
Diffstat (limited to 'net/mac80211/mesh.c')
| -rw-r--r-- | net/mac80211/mesh.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 65acbf5eed2d..a4225ae69681 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -463,8 +463,7 @@ int ieee80211_fill_mesh_addresses(struct ieee80211_hdr *hdr, __le16 *fc, 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); |