summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorChun-Yeow Yeoh <yeohchunyeow@gmail.com>2013-07-12 18:55:22 +0800
committerJohannes Berg <johannes.berg@intel.com>2013-07-16 09:58:14 +0300
commitb60e527a729cbb9c88b49cc10738a13328cd1ed2 (patch)
treefbf12620ed42130eb7e2ed322c8b5fbd5f5dc1d0 /net/mac80211
parent93c75786e8d8e8e245a479209a84b19292d08e7e (diff)
downloadop-kernel-dev-b60e527a729cbb9c88b49cc10738a13328cd1ed2.zip
op-kernel-dev-b60e527a729cbb9c88b49cc10738a13328cd1ed2.tar.gz
mac80211: set forwarding in mesh capability info
Set the Forwarding bit in Mesh Capability Info according to dot11MeshForwarding as defined in IEEE 802.11-2012 section 8.4.2.100.8. Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/mesh.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index e536f22..885a5f6 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -273,7 +273,9 @@ int mesh_add_meshconf_ie(struct ieee80211_sub_if_data *sdata,
neighbors = min_t(int, neighbors, IEEE80211_MAX_MESH_PEERINGS);
*pos++ = neighbors << 1;
/* Mesh capability */
- *pos = IEEE80211_MESHCONF_CAPAB_FORWARDING;
+ *pos = 0x00;
+ *pos |= ifmsh->mshcfg.dot11MeshForwarding ?
+ IEEE80211_MESHCONF_CAPAB_FORWARDING : 0x00;
*pos |= ifmsh->accepting_plinks ?
IEEE80211_MESHCONF_CAPAB_ACCEPT_PLINKS : 0x00;
/* Mesh PS mode. See IEEE802.11-2012 8.4.2.100.8 */
OpenPOWER on IntegriCloud