From nobody Thu Dec 05 07:30:17 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y3mJ968qFz5g3vC; Thu, 05 Dec 2024 07:30:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y3mJ93pp6z4KZL; Thu, 5 Dec 2024 07:30:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733383817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hzhVItoRz7yX6YR4VP4K3LnVotq6jcRhur4aMR+gm0Q=; b=vwvemsBRa5ctRignslvlrg4TulUQDEH27LdWWxLmqZDsUF2kRs12tMKdElGaM3satzAiBK NcfSUYHk4i+NryuC81Re26/IBvQdPaawQF9EbBnT0038aJMXpvvfKF2BnvejC+fzPk5c3v 3A+6qg1v5Y/p+dSgXQlDfWkDcWfpDIL6EnaPTagClSbOGBA/XgKCds4drLR1vezkORIU1p IV8QiAwzqEpSvcfuT1b1RoLYgnJ6USNout6duCAI/gtRJHqGuCyUkdAVBCHTo90a6Q/G5/ hRK2V4trMNUM70FqEKz6Hn8UMy1tRBDghe3bWZnMoQISVe6dFWQKkAhLdn2Zzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733383817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hzhVItoRz7yX6YR4VP4K3LnVotq6jcRhur4aMR+gm0Q=; b=GVVRVeisI9q8oAQ3M3OFopEu9H/JHMkSmzlNNZTdmYOfOM96CSCnEB7EVAcREhLlpllHjZ uN0HuzkoQ4RuuqQUepqmNGPmyC8z9qlC3QSPGCdq2SPxEq5MM4UOpjO64t0T4A+PM9MLI8 fQfFwucM87cxc79cM1iiaaYhmCVt+ecamlUY0n4+X/jQ1fWRJluNA0XgFrk4V/PRivbOKI 5g2ZKLzrZWNAuoqQPEsceyflRas1hdhwgzS9bjx4PTTD9SrSnvgDIuS5Xls5tABlzJaGzW TKmkd0JkPZ6hBA9YNuBk3R6VN3GCnG27HSbpi08eVTrXBisQZm+2u7H7dM0mtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733383817; a=rsa-sha256; cv=none; b=Gq6yiFG8BwAGB8MJzPajgvbGmb8ECxHMc/klEX3Soumgv6Wz7iRTSpwoHv6VrC7rZjI3WF Y8ZseTx6Y/AQz4KDQd1xBJ0WOle/Y8jQXHhjyKdsptormhQeT0Ic56hN1KmFKaSlba0adX ig6PKH/i2gbzJ7skGvMSDNhX0TMKQ4V7bgi7N4EHuLDLuM+0W0BORqUS0WV/qwLbF5d54K 0v2v6DrN6og3pDRG4VDyYsyl1N7VTM9nA1KbYN2ad9Qp67AQpK7KJJkqT4+hUSvnnRTOyN wZlTW65fAXilmZ9QATzxhJdP5CEyoieXvsC/HgQLg33Y5VwYAa8v6tGC2X5teA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y3mJ9317Dzjhd; Thu, 5 Dec 2024 07:30:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B57UHa9023377; Thu, 5 Dec 2024 07:30:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B57UHjF023373; Thu, 5 Dec 2024 07:30:17 GMT (envelope-from git) Date: Thu, 5 Dec 2024 07:30:17 GMT Message-Id: <202412050730.4B57UHjF023373@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 81aef988acc7 - main - rtwn: remove the conditional compilation around the sc_ht40 option. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81aef988acc7b48e7943831cb4b4087895e108bc Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=81aef988acc7b48e7943831cb4b4087895e108bc commit 81aef988acc7b48e7943831cb4b4087895e108bc Author: Adrian Chadd AuthorDate: 2024-12-02 05:11:02 +0000 Commit: Adrian Chadd CommitDate: 2024-12-05 07:27:26 +0000 rtwn: remove the conditional compilation around the sc_ht40 option. This option stems from a bunch of issues a long time ago where HT40 support on some NICs is unstable - likely because we're not setting up the RF/baseband correctly. In any case, it doesn't need to be conditionally compiled anymore. Leave it in, leave it off by default, and various chipset initialisation paths can decide whether to enable it themselves. Reviewed by: emaste --- sys/dev/rtwn/if_rtwn.c | 2 -- sys/dev/rtwn/if_rtwnvar.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/sys/dev/rtwn/if_rtwn.c b/sys/dev/rtwn/if_rtwn.c index df18dc54ed3f..e452448976dd 100644 --- a/sys/dev/rtwn/if_rtwn.c +++ b/sys/dev/rtwn/if_rtwn.c @@ -326,12 +326,10 @@ rtwn_sysctlattach(struct rtwn_softc *sc) struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(sc->sc_dev); struct sysctl_oid *tree = device_get_sysctl_tree(sc->sc_dev); -#if 1 sc->sc_ht40 = 0; SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "ht40", CTLFLAG_RDTUN, &sc->sc_ht40, sc->sc_ht40, "Enable 40 MHz mode support"); -#endif #ifdef RTWN_DEBUG SYSCTL_ADD_U32(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, diff --git a/sys/dev/rtwn/if_rtwnvar.h b/sys/dev/rtwn/if_rtwnvar.h index f4c6d7ee64b4..3d4db0a37a9e 100644 --- a/sys/dev/rtwn/if_rtwnvar.h +++ b/sys/dev/rtwn/if_rtwnvar.h @@ -171,9 +171,7 @@ struct rtwn_softc { struct mbufq sc_snd; device_t sc_dev; -#if 1 int sc_ht40; -#endif uint32_t sc_debug; int sc_hwcrypto; int sc_ratectl_sysctl;