Return-path: Received: from mail-pa0-f46.google.com ([209.85.220.46]:38588 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761754Ab3EFXtb (ORCPT ); Mon, 6 May 2013 19:49:31 -0400 Received: by mail-pa0-f46.google.com with SMTP id fa10so67307pad.33 for ; Mon, 06 May 2013 16:49:31 -0700 (PDT) From: Colleen Twitty To: Johannes Berg Cc: open80211s , linux-wirelss Subject: [PATCH v2 2/2] mac80211: enable Auth Protocol Identifier on mesh config. Date: Mon, 6 May 2013 16:49:24 -0700 Message-Id: <1367884164-15953-2-git-send-email-colleen@cozybit.com> (sfid-20130507_014942_128409_39CCB7ED) In-Reply-To: <1367884164-15953-1-git-send-email-colleen@cozybit.com> References: <1367884164-15953-1-git-send-email-colleen@cozybit.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: Previously the mesh_auth_id was disabled. Instead set the correct mesh authentication bit based on the mesh setup. Signed-off-by: Colleen Twitty --- net/mac80211/cfg.c | 1 + net/mac80211/mesh.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 1f51bdf..65b9cab 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; diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 6952760..c13db9a 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -748,7 +748,6 @@ int ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata) ieee80211_configure_filter(local); ifmsh->mesh_cc_id = 0; /* Disabled */ - ifmsh->mesh_auth_id = 0; /* Disabled */ /* register sync ops from extensible synchronization framework */ ifmsh->sync_ops = ieee80211_mesh_sync_ops_get(ifmsh->mesh_sp_id); ifmsh->adjusting_tbtt = false; -- 1.7.9.5