summaryrefslogtreecommitdiffstats
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
authorColleen Twitty <colleen@cozybit.com>2013-05-08 20:46:00 +0200
committerJohannes Berg <johannes.berg@intel.com>2013-05-16 22:39:43 +0200
commit0d4261ad5d0028b26cd88e645b4507eed8aab3f7 (patch)
treec2ef7d8d10ff40ed7ce3ddce1938e35728756633 /net/mac80211/cfg.c
parentcfg80211: Userspace may inform kernel of mesh auth method. (diff)
downloadlinux-0d4261ad5d0028b26cd88e645b4507eed8aab3f7.tar.xz
linux-0d4261ad5d0028b26cd88e645b4507eed8aab3f7.zip
mac80211: enable Auth Protocol Identifier on mesh config.
Previously the mesh_auth_id was disabled. Instead set the correct mesh authentication bit based on the mesh setup. Signed-off-by: Colleen Twitty <colleen@cozybit.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r--net/mac80211/cfg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 66989458f5ff..eb4219051043 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1746,6 +1746,7 @@ static int copy_mesh_setup(struct ieee80211_if_mesh *ifmsh,
ifmsh->mesh_pp_id = setup->path_sel_proto;
ifmsh->mesh_pm_id = setup->path_metric;
ifmsh->user_mpm = setup->user_mpm;
+ ifmsh->mesh_auth_id = setup->auth_id;
ifmsh->security = IEEE80211_MESH_SEC_NONE;
if (setup->is_authenticated)
ifmsh->security |= IEEE80211_MESH_SEC_AUTHED;