From patchwork Fri May 3 19:11:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colleen Twitty X-Patchwork-Id: 2518991 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 684BF3FCA5 for ; Fri, 3 May 2013 19:12:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933693Ab3ECTMY (ORCPT ); Fri, 3 May 2013 15:12:24 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:38281 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760354Ab3ECTMX (ORCPT ); Fri, 3 May 2013 15:12:23 -0400 Received: by mail-pa0-f53.google.com with SMTP id kq12so1069673pab.26 for ; Fri, 03 May 2013 12:12:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=I1A096fp1gvJ5nvu/G75YX6VG8bpV4R3sdmSwZH646I=; b=Yx225oD6VKSNDv1dy+Amyk2vSAQywJc83eUi/7DJv9ZeDfp0Amt3O/vQHKDRxMXNCJ JCp1PBkScuzj9ap9D4SP3IUWlEAGmYt0BgLNHF+gCyt1joLJcLcDKchrOPMroaH1YFL/ WbA6FQ7MZUctjEODTFJiChdgP0ANiHemkih6qp+CnXP9rbz/sQdGtlAD1sK37Sz4tRwI 22IMzfj/PbCipyOwMIb94Dq9BqIw5YiYv1YYxxBpD2HiiqFLWrUQLFFuNAZL/iQ7Htd0 92Vsu1Tt+bg/Ue/qmD0rmYiTi8T6IPKaZTSeoW59ssdL2gT9ZYXbvwVE1BjUwY4CY7Q4 X+7Q== X-Received: by 10.68.129.197 with SMTP id ny5mr13351852pbb.180.1367608343041; Fri, 03 May 2013 12:12:23 -0700 (PDT) Received: from figaro.lan (70-35-43-50.static.wiline.com. [70.35.43.50]) by mx.google.com with ESMTPSA id do4sm12707516pbc.8.2013.05.03.12.12.21 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 03 May 2013 12:12:22 -0700 (PDT) From: Colleen Twitty To: Johannes Berg Cc: open80211s , linux-wirelss Subject: [PATCH 2/2] mac80211: enable Auth Protocol Identifier on mesh config. Date: Fri, 3 May 2013 12:11:48 -0700 Message-Id: <1367608308-588-2-git-send-email-colleen@cozybit.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1367608308-588-1-git-send-email-colleen@cozybit.com> References: <1367608308-588-1-git-send-email-colleen@cozybit.com> X-Gm-Message-State: ALoCoQlxnFrBbMXTwmLf/OciDmNUGm+f6gVK90S5BirlEra3ItymuzYda35VcO293nYQeae84b5B Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org 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;