summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorChun-Yeow Yeoh <yeohchunyeow@gmail.com>2012-06-15 00:23:53 +0800
committerJohannes Berg <johannes.berg@intel.com>2012-06-18 13:55:16 +0200
commit58886a9011f8eae705b9f585ec6c80b34f3c4e6c (patch)
tree653df6a75245fa683c96e9f19e1a37acd1d6e48d /net
parent728b19e5fb9bbebbd580784a092b786fe379ed8e (diff)
downloadlinux-58886a9011f8eae705b9f585ec6c80b34f3c4e6c.tar.gz
linux-58886a9011f8eae705b9f585ec6c80b34f3c4e6c.tar.bz2
linux-58886a9011f8eae705b9f585ec6c80b34f3c4e6c.zip
mac80211: fix the assignment of mesh element TTL
This patch fixes the wrong assignment of mesh element TTL. Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/cfg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 6e25ac4873c7..17162fcc24bc 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1530,7 +1530,7 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,
if (_chg_mesh_attr(NL80211_MESHCONF_TTL, mask))
conf->dot11MeshTTL = nconf->dot11MeshTTL;
if (_chg_mesh_attr(NL80211_MESHCONF_ELEMENT_TTL, mask))
- conf->dot11MeshTTL = nconf->element_ttl;
+ conf->element_ttl = nconf->element_ttl;
if (_chg_mesh_attr(NL80211_MESHCONF_AUTO_OPEN_PLINKS, mask))
conf->auto_open_plinks = nconf->auto_open_plinks;
if (_chg_mesh_attr(NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR, mask))