From patchwork Thu Jan 22 21:49:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bob Copeland X-Patchwork-Id: 5688871 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 86639C058D for ; Thu, 22 Jan 2015 21:50:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A944F20251 for ; Thu, 22 Jan 2015 21:50:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 598422024F for ; Thu, 22 Jan 2015 21:50:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754543AbbAVVuY (ORCPT ); Thu, 22 Jan 2015 16:50:24 -0500 Received: from mail-ig0-f175.google.com ([209.85.213.175]:43437 "EHLO mail-ig0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754508AbbAVVuW (ORCPT ); Thu, 22 Jan 2015 16:50:22 -0500 Received: by mail-ig0-f175.google.com with SMTP id hn18so9033039igb.2 for ; Thu, 22 Jan 2015 13:50:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=8wDuWaZupqzcHTJDPZ1WBLwCcdUzdpMzB9JNl5evH5c=; b=hElVj7Ld6wIjyrdEP+9ls+233fBYOsWz6IAu7SBFD8R332G3mcmaSodZZ0FZfHqdEh w2L82P5pjlB+6adSpK8RRNwIqDy461DF3DOZjahijj+AX2sKYSeDxChIRxWmZmrJD5IE qwCtYy0rrs4d30U5g6uTF7cqx0H8S4aCH0E9uOw85kfwi/XxQNRibTvifZ2ynIOee9Jg 5jxVQT+B6Bx6j/hDA/MZ1Mm/R6b2nrSIA9sUlvVOEVyeKn4+66631pfzwfjRYb5QMNjN PN4EwhyuHj+8buKupRXeTGS+ki66FJ7Z+Y2zI/VFZeC/ldG1JfNRmGv49QKg9C28lNUz KV+Q== X-Gm-Message-State: ALoCoQnpwf/RFrTx3zHNf56NqmbwH7cZ+CMvMK9Dus0+x+mH+apsfIl5y7wb2HY/lkD4ekpOa+YC X-Received: by 10.107.135.206 with SMTP id r75mr428545ioi.32.1421963421422; Thu, 22 Jan 2015 13:50:21 -0800 (PST) Received: from hash ([2001:470:1d:6db:230:48ff:fe9d:9c89]) by mx.google.com with ESMTPSA id kz4sm3752023igb.17.2015.01.22.13.50.19 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 22 Jan 2015 13:50:20 -0800 (PST) Received: from bob by hash with local (Exim 4.80) (envelope-from ) id 1YEPda-0000rP-Kl; Thu, 22 Jan 2015 16:50:02 -0500 From: Bob Copeland To: johannes@sipsolutions.net, linux-wireless@vger.kernel.org Cc: Bob Copeland , "Nishikawa, Kenzoh" , Masashi Honma Subject: [PATCH] Revert "mac80211: keep sending peer candidate events while in listen state" Date: Thu, 22 Jan 2015 16:49:53 -0500 Message-Id: <1421963393-3275-1-git-send-email-me@bobcopeland.com> X-Mailer: git-send-email 1.7.10.4 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 This reverts commit 2ae70efcea7a695a62bb47170d3fb16674b8dbea. The new peer events that are generated by the change are causing problems with wpa_supplicant in userspace: wpa_s tries to restart SAE authentication with the peer when receiving the event, even though authentication may be in progress already, and it gets very confused. Revert back to the original operating mode, which is to only get events when there is no corresponding station entry. Cc: Nishikawa, Kenzoh Cc: Masashi Honma Signed-off-by: Bob Copeland --- As for the original patch purpose, I think the right thing to do is just run a timer in userspace to restart peering for open mesh (we already have something like this for AMPE). If peering doesn't complete after a few tries, either mark it blocked or just delete the station and start getting events again, if the peer is in fact alive. net/mac80211/mesh_plink.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index fa94ca1..b488e18 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c @@ -523,13 +523,6 @@ void mesh_neighbour_update(struct ieee80211_sub_if_data *sdata, sdata->u.mesh.mshcfg.auto_open_plinks && rssi_threshold_check(sdata, sta)) 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_ATOMIC); ieee80211_mps_frame_release(sta, elems); out: