From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D51F8C001DF for ; Mon, 26 Jun 2023 21:50:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229597AbjFZVuE (ORCPT ); Mon, 26 Jun 2023 17:50:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230152AbjFZVuB (ORCPT ); Mon, 26 Jun 2023 17:50:01 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97AD79D; Mon, 26 Jun 2023 14:49:59 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3277F60F51; Mon, 26 Jun 2023 21:49:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6ECC5C433C0; Mon, 26 Jun 2023 21:49:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1687816198; bh=rmf/NtGcGAur0eh2brq2RzTvLYq039Jr8ERj0dc7bwU=; h=From:To:Cc:Subject:Date:From; b=gCQbwFjLdra3jodxwSXCcLsL8jytJ+TlmU85zmX/cxytrFDh1GYg4mbaqIbEVfhfV a8m64k5SXsKCL+zsN3q0Ci715WvlvpgwwirFhHJKi3oWJSXLXEdNKN8wjtIVGtIzeN AUVlbPZ+ZsWw+IvwLEwhAoNlfO/iNjI9eyyRbk9BstgPJ++qKiCB56YHTSiK7ABXlZ ERsnmsXElDWzy7OEi28OH4I8VZ51aC6nRYnqB/43OOl+E6bZdPjG4g7fUry7MUVOgy DAV+0rnptfbsssy1CvrmmsomHo3ATH1LvzuuYjI6T1Ee1Zl+KgwErJGmczvlo/JGZV jf9fHyVtzDJIg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johannes Berg , Gregory Greenman , Sasha Levin , johannes@sipsolutions.net, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.3 01/16] wifi: cfg80211: remove links only on AP Date: Mon, 26 Jun 2023 17:49:41 -0400 Message-Id: <20230626214956.178942-1-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.3.9 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johannes Berg [ Upstream commit 34d4e3eb67fed9c19719bedb748e5a8b6ccc97a5 ] Since links are only controlled by userspace via cfg80211 in AP mode, also only remove them from the driver in that case. Signed-off-by: Johannes Berg Signed-off-by: Gregory Greenman Link: https://lore.kernel.org/r/20230608163202.ed65b94916fa.I2458c46888284cc5ce30715fe642bc5fc4340c8f@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/util.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/net/wireless/util.c b/net/wireless/util.c index d1a89e82ead08..4053d65d0218b 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -5,7 +5,7 @@ * Copyright 2007-2009 Johannes Berg * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright 2017 Intel Deutschland GmbH - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation */ #include #include @@ -2548,6 +2548,13 @@ void cfg80211_remove_links(struct wireless_dev *wdev) { unsigned int link_id; + /* + * links are controlled by upper layers (userspace/cfg) + * only for AP mode, so only remove them here for AP + */ + if (wdev->iftype != NL80211_IFTYPE_AP) + return; + wdev_lock(wdev); if (wdev->valid_links) { for_each_valid_link(wdev, link_id) -- 2.39.2