From patchwork Mon May 6 23:49:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colleen Twitty X-Patchwork-Id: 2528821 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 C8E6C400ED for ; Mon, 6 May 2013 23:49:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761763Ab3EFXte (ORCPT ); Mon, 6 May 2013 19:49:34 -0400 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) 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=mP3bPbgX2ngbMrI+o/PT5AUQ2jjqidGOX/My5IsS/RP4HRGe0mhrCB4zh5UyCN6/lp lYfGHb5nnNLadaKr/9zI//hJVAKceHzvYrocZ8shzp9UWkxUEkCYWDobAgExzoj/y34B 4c07h3PUPTuHTVYlSsHWoUXIWkuek4YOydgA8qi6MGXIvuJsQnXHe+ECjQHPhMdfp+9K cfboJ26dMWHPGs/9z93Epcej2gUkjmJM22fu89F7F0C7jyDIzBAP2/GPSLQmqcNe2QXt HfQStOeSWQsN+gKG0WWiMPRo/bv0N5ovr0jUdnVsCqQwRsIr/EbqBVo2/yF91jQRzA2C pSWw== X-Received: by 10.66.138.109 with SMTP id qp13mr113986pab.127.1367884171468; Mon, 06 May 2013 16:49:31 -0700 (PDT) Received: from figaro.lan (70-35-43-50.static.wiline.com. [70.35.43.50]) by mx.google.com with ESMTPSA id ri8sm14603011pbc.3.2013.05.06.16.49.29 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 06 May 2013 16:49:30 -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> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1367884164-15953-1-git-send-email-colleen@cozybit.com> References: <1367884164-15953-1-git-send-email-colleen@cozybit.com> X-Gm-Message-State: ALoCoQmxJy3X2ZKuwqGd9cBwykHLHzA9UTMYdDsUQHu1q/elyJfrj9qrbk762gxJA6snNJcnWJUm 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;