From patchwork Sat Jun 25 23:14:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bob Copeland X-Patchwork-Id: 9198899 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 0ADC66075F for ; Sat, 25 Jun 2016 23:14:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DBE4228529 for ; Sat, 25 Jun 2016 23:14:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE4C02852E; Sat, 25 Jun 2016 23:14:46 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 0FB1228529 for ; Sat, 25 Jun 2016 23:14:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751298AbcFYXOl (ORCPT ); Sat, 25 Jun 2016 19:14:41 -0400 Received: from mail-qk0-f195.google.com ([209.85.220.195]:34040 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751231AbcFYXOk (ORCPT ); Sat, 25 Jun 2016 19:14:40 -0400 Received: by mail-qk0-f195.google.com with SMTP id j2so25584895qkf.1 for ; Sat, 25 Jun 2016 16:14:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bobcopeland-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=BkU/Z7QrYa+aEuexG8CaIQRX4YJwmzEQRx+QlE2nTh4=; b=M2MxtRbMF+73AMK9AYZYyL60BTmVLCNhd+JMieo80mlJ8M827XaFxBib8U+FFob7wE 9m60Y1ZAgDND4b5WoaLAcIDRcM5HC5xTn1GPiXl4rkkGDlwAGu0WOn9ggRPhhQch2xaZ v5EvJ0IKTeUAq+KheWOTofpf9Q8AAcor3LeMdbzSLOK/WkL5AECfcjw97rgPpSoHCGuE uM0cHO4lUiF61S6LT8PwvVI2BYZ+nxgWeHykBDUQSR22EQHP2B5vFgke541Z9rUlDQfJ ubPClE4a1K4RYpUxtF2aaHTm8G3s6JXNSNrZjF+SEb5s7op4N4D4noPfBeBYJWQnGsTH Q+bw== 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=BkU/Z7QrYa+aEuexG8CaIQRX4YJwmzEQRx+QlE2nTh4=; b=eAH3VHAa3SYiNX0veAPnwyZ498uJnhhZCP/7Y/YTniyP3DKz7YYuwZ/lquH+fRDavX vOqDozLSkyMD/9SSLvpB8YBv28+rkIbIb26yFVZ/cca0HTxjfpv8cxNFAUCw7A2w9VPq V/iWCExLYcTuWdeRC8nJfIdd2GRcm9aIGAlXqYYTAWS4T9rXTNJlgdoX9dTwlbIHan3g LWCG3rw4Su8p1NgU+TrfDPgUUgKKFFi1/nChyJQEjC5HXFVzNH7d9qELV6nxT6ZNypUK cXrNA5XhpBC0VBnnQQJgT6dYAjoAs0Z4Ev31cKuhDRDk8zwiWHjG6TJ+SYflvW8xJuCs t+2Q== X-Gm-Message-State: ALyK8tJplUj2YGv9Kzx6SHj6nOfSeIP93wHnCVEDqJZzBmNsbaZzVpJoZhLXCvKnW5hVGQ== X-Received: by 10.55.68.22 with SMTP id r22mr14064206qka.129.1466896479110; Sat, 25 Jun 2016 16:14:39 -0700 (PDT) Received: from hash (CPE0018e7fe5281-CM18593342f28f.cpe.net.cable.rogers.com. [99.254.238.186]) by smtp.gmail.com with ESMTPSA id p62sm3772053qkd.21.2016.06.25.16.14.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Jun 2016 16:14:38 -0700 (PDT) Received: from bob by hash with local (Exim 4.84_2) (envelope-from ) id 1bGwmW-00055K-1Q; Sat, 25 Jun 2016 19:14:32 -0400 From: Bob Copeland To: Johannes Berg Cc: Jouni Malinen , linux-wireless@vger.kernel.org, Bob Copeland Subject: [PATCH] mac80211: use common cleanup for user/!user_mpm Date: Sat, 25 Jun 2016 19:14:16 -0400 Message-Id: <20160625231416.19488-1-me@bobcopeland.com> X-Mailer: git-send-email 2.9.0 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 We've accumulated a couple of different fixes now to mesh_sta_cleanup() due to the different paths that user_mpm and !user_mpm cases take -- one fix to flush nexthop paths and one to fix the counting. The only caller of mesh_plink_deactivate() is mesh_sta_cleanup(), so we can push the user_mpm checks down into there in order to share more code. In doing so, we can remove an extra call to mesh_path_flush_by_nexthop() and the (unnecessary) call to mesh_accept_plinks_update(). This will also ensure the powersaving state code gets called in the user_mpm case. The only cleanup tasks we need to avoid when MPM is in user-space are sending the peering frames and stopping the plink timer, so wrap those in the appropriate check. Signed-off-by: Bob Copeland --- This applies on top of Jouni's patch, "mac80211: Fix mesh estab_plinks counting in STA removal case", so this can go for -next. net/mac80211/mesh.c | 20 +------------------- net/mac80211/mesh_plink.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 6a1603b..c66411d 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -148,25 +148,7 @@ u32 mesh_accept_plinks_update(struct ieee80211_sub_if_data *sdata) void mesh_sta_cleanup(struct sta_info *sta) { struct ieee80211_sub_if_data *sdata = sta->sdata; - u32 changed = 0; - - /* - * maybe userspace handles peer allocation and peering, but in either - * case the beacon is still generated by the kernel and we might need - * an update. - */ - if (sdata->u.mesh.user_mpm && - sta->mesh->plink_state == NL80211_PLINK_ESTAB) - changed |= mesh_plink_dec_estab_count(sdata); - changed |= mesh_accept_plinks_update(sdata); - if (!sdata->u.mesh.user_mpm) { - changed |= mesh_plink_deactivate(sta); - del_timer_sync(&sta->mesh->plink_timer); - } - - /* make sure no readers can access nexthop sta from here on */ - mesh_path_flush_by_nexthop(sta); - synchronize_net(); + u32 changed = mesh_plink_deactivate(sta); if (changed) ieee80211_mbss_info_change_notify(sdata, changed); diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index 79f2a0a..7fcdcf6 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c @@ -370,13 +370,21 @@ u32 mesh_plink_deactivate(struct sta_info *sta) spin_lock_bh(&sta->mesh->plink_lock); changed = __mesh_plink_deactivate(sta); - sta->mesh->reason = WLAN_REASON_MESH_PEER_CANCELED; - mesh_plink_frame_tx(sdata, sta, WLAN_SP_MESH_PEERING_CLOSE, - sta->sta.addr, sta->mesh->llid, sta->mesh->plid, - sta->mesh->reason); + + if (!sdata->u.mesh.user_mpm) { + sta->mesh->reason = WLAN_REASON_MESH_PEER_CANCELED; + mesh_plink_frame_tx(sdata, sta, WLAN_SP_MESH_PEERING_CLOSE, + sta->sta.addr, sta->mesh->llid, + sta->mesh->plid, sta->mesh->reason); + } spin_unlock_bh(&sta->mesh->plink_lock); + if (!sdata->u.mesh.user_mpm) + del_timer_sync(&sta->mesh->plink_timer); mesh_path_flush_by_nexthop(sta); + /* make sure no readers can access nexthop sta from here on */ + synchronize_net(); + return changed; }