Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp508694imw; Wed, 13 Jul 2022 02:48:49 -0700 (PDT) X-Google-Smtp-Source: AGRyM1v8vnyZbxi7RDHuV6ZbcyF7F3ydn+lsAamHAZax89OJIpPmw4eY0LJmpio9ODFXzgd6j8BY X-Received: by 2002:a17:90a:f8d1:b0:1ef:8795:c7e with SMTP id l17-20020a17090af8d100b001ef87950c7emr2951635pjd.74.1657705728932; Wed, 13 Jul 2022 02:48:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657705728; cv=none; d=google.com; s=arc-20160816; b=i0jZmZpPioyWVIX8uLKYu3xDST+u0lNx6Tqwq2RmqxrpiRaJgCRlBwDuNYaIdLs7v3 oa77CawiEqT1OyZUfOjhkdWPU6YAXAMQC3ydNTEJkVq84uyDZMycrrpzWxFpvbzDRWb3 iNrNGruPw2+hn16Fhp3CGijFhC21X7ss1dXJH98E4JlVkckEL5DU6T7cHBtoxF2L6I45 TAQtgcaz+Ekko1OjJK/vtBqTOciOztfTgNGCd8J2+ySNOUIasx2ontcJPxJdBmaAKUU7 x8D3UIOJUFxUXHiI/Zv/FLw8K++XFcpPhusAMgsYW0Gs3n2A0Grz41MmX1hCSO7v7UO6 gOKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9i0+Y6BJhdZObmwXL8pbMHrzRCCoYihLJWRJ3Sgnm1M=; b=WE4whMCNtFH+pjlJx4Ugh7aajk11u41C6xYYz40/aiLPPeAdi+NZp/gZHrDfeUH1TX ofA9iKbGKJbUeKqY3S1rvPMItdZpjKaS3tVlHsS2meYVZirxWgUwVnynLV+iu/RTzI+p N/bf1WomCcwzrqEgEts8umkW4wPkgWTuuIiuNF1RAjcuxE6trHgVcnndx479/2RwIWZm BCJ6u7FeVT3mrFsPNUt0jTM3v3XGU6JBtmmh15vqFAplCNoW8ma5tfUGmnYUUV9FMuiM beGplNoAMJY94UELEZeXCGUt3r75ttjBI3e+lklFVI5FcT5wBlJ6cWK//uttj8glptwA zNjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sipsolutions.net header.s=mail header.b=iWW6QloM; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=sipsolutions.net Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t16-20020a170902e85000b00153b640ed90si15129697plg.38.2022.07.13.02.48.41; Wed, 13 Jul 2022 02:48:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sipsolutions.net header.s=mail header.b=iWW6QloM; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=sipsolutions.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234780AbiGMJq6 (ORCPT + 65 others); Wed, 13 Jul 2022 05:46:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235849AbiGMJpm (ORCPT ); Wed, 13 Jul 2022 05:45:42 -0400 Received: from sipsolutions.net (s3.sipsolutions.net [IPv6:2a01:4f8:191:4433::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E663F6B8C for ; Wed, 13 Jul 2022 02:45:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sipsolutions.net; s=mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Content-Type:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-To: Resent-Cc:Resent-Message-ID; bh=9i0+Y6BJhdZObmwXL8pbMHrzRCCoYihLJWRJ3Sgnm1M=; t=1657705531; x=1658915131; b=iWW6QloMGrA42AkwXGrpj1xvH9cZAxC4HouzcZby482e7H8 ISsWAk5hcuL8DWUuwcOZUhF5Fo3K6hqQW2spFQMGMFDT4m1kwxC0JX8VSxkzKB9Sz2QJLnBPAAiC7 R1SnpsDEzz3ax/g5fUduZ3SlRPH6H26tajEzD+QRMnGgjSJLUqgD6NbdjI8h1qLOjaKqrqr4nzIX8 YGmP97UDLtqrMKAPY2rM7uSSnEmpibuOcs91Mdwksw1FF8hYY+2tXFPd1yGVqFFFDP1UYmNbn/FT/ zbAdesYuTsa7w3EaNbzMwbCqF5ZgtXRzJZm3WD8HFhrv5p/8t0xMSYDLgskKzUVw==; Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.95) (envelope-from ) id 1oBYvx-00EgvB-AA; Wed, 13 Jul 2022 11:45:29 +0200 From: Johannes Berg To: linux-wireless@vger.kernel.org Cc: Andrei Otcheretianski Subject: [PATCH 71/76] wifi: mac80211: don't check carrier in chanctx code Date: Wed, 13 Jul 2022 11:44:57 +0200 Message-Id: <20220713114426.2dbf640f068d.I4e28ba43aa4a0ec15993aa5ef0879549e8a767a0@changeid> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220713094502.163926-1-johannes@sipsolutions.net> References: <20220713094502.163926-1-johannes@sipsolutions.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Andrei Otcheretianski We check here that we don't enable TX (netif_carrier_ok()) before we actually start using some channel context, but to our knowledge this check has never triggered, and with MLO it's just wrong since links can be added and removed much more dynamically than before. Simply remove the checks, there's no really good way to do anything that would replace them. Signed-off-by: Andrei Otcheretianski Signed-off-by: Johannes Berg --- net/mac80211/chan.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c index 5ab210706123..2e9bc285f0a5 100644 --- a/net/mac80211/chan.c +++ b/net/mac80211/chan.c @@ -1800,8 +1800,6 @@ int ieee80211_link_use_channel(struct ieee80211_link_data *link, lockdep_assert_held(&local->mtx); - WARN_ON(sdata->dev && netif_carrier_ok(sdata->dev)); - mutex_lock(&local->chanctx_mtx); ret = cfg80211_chandef_dfs_required(local->hw.wiphy, @@ -1989,8 +1987,6 @@ void ieee80211_link_release_channel(struct ieee80211_link_data *link) { struct ieee80211_sub_if_data *sdata = link->sdata; - WARN_ON(sdata->dev && netif_carrier_ok(sdata->dev)); - mutex_lock(&sdata->local->chanctx_mtx); if (rcu_access_pointer(link->conf->chanctx_conf)) { lockdep_assert_held(&sdata->local->mtx); -- 2.36.1