git: 81aef988acc7 - main - rtwn: remove the conditional compilation around the sc_ht40 option.

The branch main has been updated by adrian:

URL: https://cgit.FreeBSD.org/src/commit/?id=81aef988acc7b48e7943831cb4b4087895e108bc

commit 81aef988acc7b48e7943831cb4b4087895e108bc
Author:     Adrian Chadd <adrian@FreeBSD.org>
AuthorDate: 2024-12-02 05:11:02 +0000
Commit:     Adrian Chadd <adrian@FreeBSD.org>
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;