diff options
| author | Chun-Yeow Yeoh | 2013-07-12 12:55:22 +0200 |
|---|---|---|
| committer | Johannes Berg | 2013-07-16 08:58:14 +0200 |
| commit | b60e527a729cbb9c88b49cc10738a13328cd1ed2 (patch) | |
| tree | fbf12620ed42130eb7e2ed322c8b5fbd5f5dc1d0 /net/mac80211 | |
| parent | mac80211: fix off-by-one regression in ibss beacon generation (diff) | |
| download | kernel-qcow2-linux-b60e527a729cbb9c88b49cc10738a13328cd1ed2.tar.gz kernel-qcow2-linux-b60e527a729cbb9c88b49cc10738a13328cd1ed2.tar.xz kernel-qcow2-linux-b60e527a729cbb9c88b49cc10738a13328cd1ed2.zip | |
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.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index e536f22fbeca..885a5f6e2c21 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 */ |