From patchwork Mon Nov 17 09:35:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nishikawa, Kenzoh" X-Patchwork-Id: 5316531 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 408AD9F2ED for ; Mon, 17 Nov 2014 09:36:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 119812011E for ; Mon, 17 Nov 2014 09:36:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6BB80200E1 for ; Mon, 17 Nov 2014 09:36:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751813AbaKQJgg (ORCPT ); Mon, 17 Nov 2014 04:36:36 -0500 Received: from mail-hk1on0142.outbound.protection.outlook.com ([134.170.140.142]:19417 "EHLO APAC01-HK1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751135AbaKQJgf (ORCPT ); Mon, 17 Nov 2014 04:36:35 -0500 Received: from SINPR01CA0039.apcprd01.prod.exchangelabs.com (10.141.109.39) by HK2PR01MB0435.apcprd01.prod.exchangelabs.com (25.161.184.22) with Microsoft SMTP Server (TLS) id 15.1.16.15; Mon, 17 Nov 2014 09:36:32 +0000 Received: from AM1FFO11FD052.protection.gbl (2a01:111:f400:7e00::129) by SINPR01CA0039.outlook.office365.com (2a01:111:e400:a817::39) with Microsoft SMTP Server (TLS) id 15.1.16.15 via Frontend Transport; Mon, 17 Nov 2014 09:36:30 +0000 Received: from JPYOKXEG101.jp.sony.com (117.103.190.41) by AM1FFO11FD052.mail.protection.outlook.com (10.174.65.215) with Microsoft SMTP Server (TLS) id 15.1.6.13 via Frontend Transport; Mon, 17 Nov 2014 09:36:28 +0000 Received: from JPYOKXHT104.jp.sony.com (117.103.191.51) by JPYOKXEG101.jp.sony.com (117.103.190.41) with Microsoft SMTP Server (TLS) id 14.3.210.2; Mon, 17 Nov 2014 09:35:41 +0000 Received: from JPYOKXMS113.jp.sony.com ([169.254.3.151]) by JPYOKXHT104.jp.sony.com ([117.103.191.51]) with mapi id 14.03.0210.002; Mon, 17 Nov 2014 09:35:42 +0000 From: "Nishikawa, Kenzoh" To: "linux-wireless@vger.kernel.org" CC: "devel@lists.open80211s.org" , Thomas Pedersen Subject: [PATCH v2] mac80211: Send peering open frame again if beacon from listen state peer is received Thread-Topic: [PATCH v2] mac80211: Send peering open frame again if beacon from listen state peer is received Thread-Index: AdACSIufn60hT/4BR9uX/MnA7zvmMg== Date: Mon, 17 Nov 2014 09:35:42 +0000 Message-ID: <2EB4F5C65A3B8E4E92660930F4EF6B5B069684@JPYOKXMS113.jp.sony.com> Accept-Language: ja-JP, en-US Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [43.22.83.18] MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:117.103.190.41; CTRY:JP; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(428002)(189002)(199003)(23726002)(46406003)(50466002)(87936001)(86362001)(44976005)(19580395003)(92566001)(6806004)(92726001)(64706001)(106466001)(54356999)(105586002)(95666004)(2656002)(50986999)(66066001)(15975445006)(101416001)(21056001)(4396001)(77096003)(77156002)(62966003)(110136001)(15202345003)(31966008)(16796002)(99396003)(55846006)(47776003)(20776003)(107046002)(229853001)(33656002)(2351001)(46102003)(97756001)(120916001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR01MB0435; H:JPYOKXEG101.jp.sony.com; FPR:; MLV:sfv; PTR:jpyokxeg101.jp.sony.com; MX:1; A:1; LANG:en; X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:HK2PR01MB0435; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:; SRVR:HK2PR01MB0435; X-Forefront-PRVS: 03982FDC1D Received-SPF: None (protection.outlook.com: jp.sony.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is 117.103.190.41) smtp.mailfrom=kenzoh.nishikawa@jp.sony.com; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:; SRVR:HK2PR01MB0435; X-OriginatorOrg: jp.sony.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fixes the problem that a mesh peering process won't be fired again after the previous first peering trial fails due to like air propagation error if the peering is managed by user space such as wpa_supplicant. This patch works with another patch for wpa_supplicant described here which fires a peering process again triggered by the notice from kernel. http://lists.shmoo.com/pipermail/hostap/2014-November/031235.html Signed-off-by: Kenzoh Nishikawa --- net/mac80211/mesh_plink.c | 7 +++++++ 1 file changed, 7 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index 32c7bd0..dfc429b 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c @@ -524,6 +524,13 @@ void mesh_neighbour_update(struct ieee80211_sub_if_data *sdata, sdata->u.mesh.mshcfg.auto_open_plinks && rssi_threshold_check(sta, sdata)) changed = mesh_plink_open(sta); + else if (sta->plink_state == NL80211_PLINK_LISTEN && + (sdata->u.mesh.user_mpm || + sdata->u.mesh.security & IEEE80211_MESH_SEC_AUTHED)) + cfg80211_notify_new_peer_candidate(sdata->dev, hw_addr, + elems->ie_start, + elems->total_len, + GFP_KERNEL); ieee80211_mps_frame_release(sta, elems); out: