From nobody Mon Apr 01 23:47:27 2024 X-Original-To: dev-commits-src-all@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 4V7nk75nqvz5FRVf; Mon, 1 Apr 2024 23:47:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7nk75DX4z4QB6; Mon, 1 Apr 2024 23:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015247; 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=Nx0+kTGqdXxg7KwbFAAOov37N62LmVx4ySTz+Mxql78=; b=Pz1MllZ6rAfzHZGhYtsEMGJu9XxC2k9gdEcuZpQPfVP6vGmuId487z4siLiF5RjW3SnQst pIZjuTTiTRGfy8CwJ5i2ZWDFfaMwVPcU3CeJNZWa0zDaUl1zAojDT+8F55Y2wgBn6B7fUu bCUGRbXUHJXOxxF2ZoJ11oQOg2JPLkIQGE3roTqEeosmrs8OENnZRvYIbLgey0SLfKTeJv M5KhSdV0ahlQTjy9YO5TpMt9uBDU/ujBLEKZeKM4Jak0GcOovVr6Ueoe8NIVpp7qF14Rb7 5nBNkMy+FDGzX3rn46AP/txLD8xZEWhjdPnvBLO0/n/fBEBIoF6JtlroSxgNIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712015247; a=rsa-sha256; cv=none; b=angC23pd6iMVCcC13oESh2knPNiHFF2GETKYtuGTVX3ZFHXPbLW2KvYjtFT0gtnbfQYQ0P XuqhuNWSZ9m/yeq0zCjYxMuUST0GkegGboW0DFeC0nf+CUVe3/5/y2j0LZRCvl2V/N9/NC xdVOQmtKxrnJWDztC6ZgqR/skpCgXW9rbgDu19G8I8tKXaGmv4njztBvDgm/tnjyuMbPEa tX4mg8mqrsKLslGychDLYWZ9rSlpE/pR2ndMjLdszwxsCse9nHeLq6zGeKCBeg+bhXMXNx zH2MBNBqFnDyRxr7sH8M5QWKBsVIQBcjvIutjiY3eNOeNalDTPVi4msW+HKoMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015247; 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=Nx0+kTGqdXxg7KwbFAAOov37N62LmVx4ySTz+Mxql78=; b=jdv6cQv+l8RsP2WhyG7peC8+3dbhmOUf4nhlMuH7wK91M9VE0TfBEf6f6mHby2HHQPuvh2 ksEWAHn3JbmA0LEW0EJDM1b6D9ClQSZGwLHwbo91GHygYCO8L16LpRfM+KZ2TFXpdpOx7n bffsdKoQdgZmgxUG3I1lKp/htueWnst/wzQqcGsG0AKGjsmGxGVHwfMBS+8QDZWsrx8d32 ehDOm+I9IgIX65mNmLK3m4QbAD+x8VfKj6BM1sqYY+O8bRqSQYEc8pBBW7W9SPtY4N1Hnw yWF1LjQqN0NpuDHr00eP1w0cmSvubeAWXQPRBxXgHK93Z/R8TlkHDN0NHOEqVQ== 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 4V7nk74jfXzR1w; Mon, 1 Apr 2024 23:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 431NlRdH083897; Mon, 1 Apr 2024 23:47:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431NlRiY083894; Mon, 1 Apr 2024 23:47:27 GMT (envelope-from git) Date: Mon, 1 Apr 2024 23:47:27 GMT Message-Id: <202404012347.431NlRiY083894@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: faf66c373ab7 - stable/14 - ath(4): always enable 11n List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: faf66c373ab7aef4bd2c9c90c0298a31c74da677 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=faf66c373ab7aef4bd2c9c90c0298a31c74da677 commit faf66c373ab7aef4bd2c9c90c0298a31c74da677 Author: Bjoern A. Zeeb AuthorDate: 2024-02-18 18:16:24 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-04-01 23:46:10 +0000 ath(4): always enable 11n Enabling 11n for ath(4) so far was handled by a kernel option, which was only enabled for certain kernel configurations. In order to allow loading ath(4) as a module with 11n support on all platforms, remove the kernel option and unconditionally enable 11n in ath(4). Reported by: pkubaj Reviewed by: adrian, imp (cherry picked from commit 89c1e54a71cc4e04d4c575ee6df956a12e163cde) --- sys/amd64/conf/GENERIC | 1 - sys/arm/conf/ARMADA38X | 1 - sys/conf/options | 1 - sys/dev/ath/if_athvar.h | 1 + sys/i386/conf/GENERIC | 1 - sys/powerpc/conf/GENERIC64 | 1 - sys/powerpc/conf/GENERIC64LE | 1 - 7 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index a88f5713de72..ab1c3856051b 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -291,7 +291,6 @@ device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs device ath_hal # Atheros CardBus/PCI chip support options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation -options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath #device bwi # Broadcom BCM430x/BCM431x wireless NICs. #device bwn # Broadcom BCM43xx wireless NICs. diff --git a/sys/arm/conf/ARMADA38X b/sys/arm/conf/ARMADA38X index d0c7ddcef60b..bb7ef098f350 100644 --- a/sys/arm/conf/ARMADA38X +++ b/sys/arm/conf/ARMADA38X @@ -90,7 +90,6 @@ device wlan # 802.11 support device ath # Atheros CardBus/PCI NICs device ath_hal device ath_rate_sample -options ATH_ENABLE_11N # CESA device cesa diff --git a/sys/conf/options b/sys/conf/options index c4da2e595ea3..afeb4bd83c06 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -814,7 +814,6 @@ ATH_TXBUF opt_ath.h ATH_RXBUF opt_ath.h ATH_DIAGAPI opt_ath.h ATH_TX99_DIAG opt_ath.h -ATH_ENABLE_11N opt_ath.h ATH_ENABLE_DFS opt_ath.h ATH_EEPROM_FIRMWARE opt_ath.h ATH_ENABLE_RADIOTAP_VENDOR_EXT opt_ath.h diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h index f706b360946a..96c4318d5987 100644 --- a/sys/dev/ath/if_athvar.h +++ b/sys/dev/ath/if_athvar.h @@ -59,6 +59,7 @@ /* * 802.11n requires more TX and RX buffers to do AMPDU. */ +#define ATH_ENABLE_11N /* 802.11n support for AR5416 and later */ #ifdef ATH_ENABLE_11N #define ATH_TXBUF 512 #define ATH_RXBUF 512 diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index c8e9cd439d74..1a57015d0dcc 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -250,7 +250,6 @@ device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs device ath_hal # Atheros CardBus/PCI chip support options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation -options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath #device bwi # Broadcom BCM430x/BCM431x wireless NICs. #device bwn # Broadcom BCM43xx wireless NICs. diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index c413e37b44fb..1e91a4cc9455 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -234,7 +234,6 @@ device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs device ath_hal # Atheros CardBus/PCI chip support options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation -options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath # FireWire support diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE index 83cf664bd5d7..d05308b9f0b9 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -230,7 +230,6 @@ device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs device ath_hal # Atheros CardBus/PCI chip support options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation -options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath # FireWire support