Commit 0d4261ad authored by Colleen Twitty's avatar Colleen Twitty Committed by Johannes Berg

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: default avatarColleen Twitty <colleen@cozybit.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 6e16d90b
...@@ -1746,6 +1746,7 @@ static int copy_mesh_setup(struct ieee80211_if_mesh *ifmsh, ...@@ -1746,6 +1746,7 @@ static int copy_mesh_setup(struct ieee80211_if_mesh *ifmsh,
ifmsh->mesh_pp_id = setup->path_sel_proto; ifmsh->mesh_pp_id = setup->path_sel_proto;
ifmsh->mesh_pm_id = setup->path_metric; ifmsh->mesh_pm_id = setup->path_metric;
ifmsh->user_mpm = setup->user_mpm; ifmsh->user_mpm = setup->user_mpm;
ifmsh->mesh_auth_id = setup->auth_id;
ifmsh->security = IEEE80211_MESH_SEC_NONE; ifmsh->security = IEEE80211_MESH_SEC_NONE;
if (setup->is_authenticated) if (setup->is_authenticated)
ifmsh->security |= IEEE80211_MESH_SEC_AUTHED; ifmsh->security |= IEEE80211_MESH_SEC_AUTHED;
......
...@@ -748,7 +748,6 @@ int ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata) ...@@ -748,7 +748,6 @@ int ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata)
ieee80211_configure_filter(local); ieee80211_configure_filter(local);
ifmsh->mesh_cc_id = 0; /* Disabled */ ifmsh->mesh_cc_id = 0; /* Disabled */
ifmsh->mesh_auth_id = 0; /* Disabled */
/* register sync ops from extensible synchronization framework */ /* register sync ops from extensible synchronization framework */
ifmsh->sync_ops = ieee80211_mesh_sync_ops_get(ifmsh->mesh_sp_id); ifmsh->sync_ops = ieee80211_mesh_sync_ops_get(ifmsh->mesh_sp_id);
ifmsh->adjusting_tbtt = false; ifmsh->adjusting_tbtt = false;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment