From patchwork Fri Mar 17 05:59:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masashi Honma X-Patchwork-Id: 9629861 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 429B060245 for ; Fri, 17 Mar 2017 06:00:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 32F9728695 for ; Fri, 17 Mar 2017 06:00:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2445F28698; Fri, 17 Mar 2017 06:00:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C538228695 for ; Fri, 17 Mar 2017 06:00:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750926AbdCQGAE (ORCPT ); Fri, 17 Mar 2017 02:00:04 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:36539 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750877AbdCQGAD (ORCPT ); Fri, 17 Mar 2017 02:00:03 -0400 Received: by mail-pg0-f66.google.com with SMTP id 81so486086pgh.3 for ; Thu, 16 Mar 2017 23:00:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kJspNJvAcM/y0wsvx7h40V/jcUtUECZMlegjPWShIZ4=; b=fl1zNTP0b0Uyh+tBlvPotFsnPxBpyLE9i+MdNgVRPSbkG6l+FSsrkllxdxgiV+V5PP 1NTBzs7jSgYwOdDo3IhM/dX4NI5ppY7/ZURnl/YSb6VuysMPAhNP/Ded53Mp1dOGkLjq uirqN0I3lqErLD5c/IFZXdVLTHmFBD2OFAlFcSNgl7PZ5CLbVLMPpRaZIeDH//n0pow6 30ycK+FlPQ/mxashEG1Pnb4jL5CYg08tJfKPouDGGDyJAIG0NU/3osXTFf+DkXmGnb3O VCFsa9Ca5lpXpqbbSAN+ASzz7jg8oMfSxoNQ7d5UFcV9h2Sc2eWJ9qBKYwbUpdKntF6n iovA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kJspNJvAcM/y0wsvx7h40V/jcUtUECZMlegjPWShIZ4=; b=HryqMtNdsNM/skRT6lm+2iOVxLtLvV7wGJ4YuaDr6ICBbaYxinmKkbPo25feZ3VNnz g12Z71B9Yo9gtj4tCZsNQWvtZa1WY5DcrjOJSFAJ2gZbLLtI9uYLQo6A4434dMgWAvc5 VScGa004k0Od92ocmrFlzZZ9kasAuE2ITuAwCMV1UqJoYrdNSa/8cjuzYvycZwh/9dF8 BDyZHEPx3qiRFRNu7ngwGLfvSosUAiNp2OmKfTVQEKr9nvqC9PgGhryv/RBqiGdtJlKG OpnC3pL6Z1uf+uwdK+PQbWF+jrDzDhrRVcIKWgfen26ehFb0NQkyz/m7424SA5Cl5p1j Jy+Q== X-Gm-Message-State: AFeK/H03FscDLR1Ls+R7CTnVN6rynvqa9dAqzzJ/jIkpEfB+VdLETKR+l99czZT5sIlVsQ== X-Received: by 10.98.67.89 with SMTP id q86mr14693974pfa.237.1489730402555; Thu, 16 Mar 2017 23:00:02 -0700 (PDT) Received: from localhost.localdomain (p6e1217.kngwnt01.ap.so-net.ne.jp. [218.110.18.23]) by smtp.gmail.com with ESMTPSA id i127sm13936736pfe.15.2017.03.16.23.00.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Mar 2017 23:00:02 -0700 (PDT) From: Masashi Honma To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Masashi Honma Subject: [PATCH v2] mac80211: Use rssi_threshold even though user_mpm=1 Date: Fri, 17 Mar 2017 14:59:44 +0900 Message-Id: <1489730384-2799-1-git-send-email-masashi.honma@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1489629438-7087-1-git-send-email-masashi.honma@gmail.com> References: <1489629438-7087-1-git-send-email-masashi.honma@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Previously the meshcfg.rssi_threshold did not work with user_mpm=1. Signed-off-by: Masashi Honma --- net/mac80211/mesh.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 6e7b6a0..281d834 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -1100,8 +1100,14 @@ static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata, if (!channel || channel->flags & IEEE80211_CHAN_DISABLED) return; - if (mesh_matches_local(sdata, &elems)) - mesh_neighbour_update(sdata, mgmt->sa, &elems); + if (mesh_matches_local(sdata, &elems)) { + mpl_dbg(sdata, "rssi_threshold=%d,rx_status->signal=%d\n", + sdata->u.mesh.mshcfg.rssi_threshold, rx_status->signal); + if (!sdata->u.mesh.user_mpm || + sdata->u.mesh.mshcfg.rssi_threshold == 0 || + sdata->u.mesh.mshcfg.rssi_threshold < rx_status->signal) + mesh_neighbour_update(sdata, mgmt->sa, &elems); + } if (ifmsh->sync_ops) ifmsh->sync_ops->rx_bcn_presp(sdata,