From nobody Tue Oct 28 01:59:18 2025 X-Original-To: dev-commits-src-branches@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 4cwYTM0z6Rz6G4SC; Tue, 28 Oct 2025 01:59:19 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cwYTL5lcMz3VXJ; Tue, 28 Oct 2025 01:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761616758; 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=0+7VEPIrb9xs2aLvp6+xZLOCuiyAWYjPmlMHHSxr0PU=; b=roA7JYkDLwSHrQIFe0Ae0uDV31qwX00F3TexW7sHA9jUfWp3uMGxSqqV5aZWmv60uX1cuS IoD379Lptb8QSSTIUx7LSP0kLtm0MCoekjXFiJMDXoz78dmDTBtRuHcOdOZDnDzUv+W/K0 LUC3eHaBTc7fJH0sSLQomKTe2jjSKUS2gCIFdfZ+DHFRHMHPbp79emzuRLZw/6vSrG5q34 vpzGbgJhtInhr2vuJQw29yYN+TAYRtjwUxQ8uvSwJUWdxIOeEQEVyP2bqmE8QtaVp0ui8S 6JonvX72HeXD1jlXvfXuOldX/nAE4nEZBaHkNSV0fNGyWKENMHXIrP2vKyjbyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761616758; 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=0+7VEPIrb9xs2aLvp6+xZLOCuiyAWYjPmlMHHSxr0PU=; b=GACNyrVBEPibt8d++nc8FRR9sw6XS5UaHi2/KOtnVywJH/JDAbAty0Wieu371CAtUUcYA8 GSyYcU7bvLRekfHVEjvJnWftsZxcYU6HIQ0mnm0UT1gHjHkEWvnGZUYOt5rQHoMbGnZTwo jtn+yB+Wro6jSrQ3XMxjC+OKcD105qm8xHwrk2fI0iSVnFWbV4U0ZxJ48xwweUj7gFS7X1 x+i60Ruy2cDP89ApyVo2WlHnBBKPcEeY2yCktvJu9NrRgrs2O1gPEd3oNnyPID9pFg3RgL g/QVzbmDDzYJKMgIq2sroGGTr2gu9g/Nij/ePgtEvuZX8h6IPVvdsVKIz9rsbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761616758; a=rsa-sha256; cv=none; b=ywk4Gu+uweyw9GS4OhcN5LFZtdl3+gv3Lig1Q5P0sW7Xn6n2z32IV+esrwp1vEb4aKWHho 09h4fpQENvag1LYpUKFbsRCAxB/ZLKODPGoXCbHasm9qZHaYHXuiIPhAHVc6oHUpjibRR8 NFNR7T9gLOjhAWkFpdRwnTfwqzYUIfEb1Cz8VAeXWQE5NsN3McUHs8kIBWmGH1rvevAyGs DxDJJzsg41OhzppDRgjdzoJeFguKvDbmAjLKdHFXqy8KESFFUd1hmORaZ42KI/+J5U6qHl PCS6qnuJ92UILT9DT6CCSI32XbXiM1KY2jEKndXGchiC8xBddjIzWCh6XKFxtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cwYTL4lSnzTc5; Tue, 28 Oct 2025 01:59:18 +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 59S1xIla071945; Tue, 28 Oct 2025 01:59:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59S1xIib071942; Tue, 28 Oct 2025 01:59:18 GMT (envelope-from git) Date: Tue, 28 Oct 2025 01:59:18 GMT Message-Id: <202510280159.59S1xIib071942@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 3dc891b8a501 - releng/15.0 - LinuxKPI: 802.11: additions for Linux v6.17 based wireless drivers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 3dc891b8a50106bc5f42c23a6ce673491b9a0649 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=3dc891b8a50106bc5f42c23a6ce673491b9a0649 commit 3dc891b8a50106bc5f42c23a6ce673491b9a0649 Author: Bjoern A. Zeeb AuthorDate: 2025-10-11 09:21:55 +0000 Commit: Colin Percival CommitDate: 2025-10-28 01:58:43 +0000 LinuxKPI: 802.11: additions for Linux v6.17 based wireless drivers This includes the conflicting changes from previous driver versions (v6.11/v6.14), mostly being function pointer or function arguments. Approved by: re (cperciva) (cherry picked from commit 76aed633b5b526fc2cdb3fa654f54b3cb8e5cfaf) (cherry picked from commit 22eb6e43d034ec325e2833f3694efe4b33fa58a0) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 14 +++++++------- sys/compat/linuxkpi/common/src/linux_80211_macops.c | 12 ++++++++---- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 523836b52a40..ee1ace3684de 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -956,7 +956,7 @@ struct ieee80211_ops { int (*start)(struct ieee80211_hw *); void (*stop)(struct ieee80211_hw *, bool); - int (*config)(struct ieee80211_hw *, u32); + int (*config)(struct ieee80211_hw *, int, u32); void (*reconfig_complete)(struct ieee80211_hw *, enum ieee80211_reconfig_type); void (*prep_add_interface)(struct ieee80211_hw *, enum nl80211_iftype); @@ -983,7 +983,7 @@ struct ieee80211_ops { void (*flush)(struct ieee80211_hw *, struct ieee80211_vif *, u32, bool); void (*flush_sta)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_sta *); - int (*set_frag_threshold)(struct ieee80211_hw *, u32); + int (*set_frag_threshold)(struct ieee80211_hw *, int, u32); void (*sync_rx_queues)(struct ieee80211_hw *); @@ -1026,8 +1026,8 @@ struct ieee80211_ops { void (*unassign_vif_chanctx)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, struct ieee80211_chanctx_conf *); int (*switch_vif_chanctx)(struct ieee80211_hw *, struct ieee80211_vif_chanctx_switch *, int, enum ieee80211_chanctx_switch_mode); - int (*get_antenna)(struct ieee80211_hw *, u32 *, u32 *); - int (*set_antenna)(struct ieee80211_hw *, u32, u32); + int (*get_antenna)(struct ieee80211_hw *, int, u32 *, u32 *); + int (*set_antenna)(struct ieee80211_hw *, int, u32, u32); int (*remain_on_channel)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_channel *, int, enum ieee80211_roc_type); int (*cancel_remain_on_channel)(struct ieee80211_hw *, struct ieee80211_vif *); @@ -1038,7 +1038,7 @@ struct ieee80211_ops { void (*bss_info_changed)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, u64); void (*link_info_changed)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, u64); - int (*set_rts_threshold)(struct ieee80211_hw *, u32); + int (*set_rts_threshold)(struct ieee80211_hw *, int, u32); void (*event_callback)(struct ieee80211_hw *, struct ieee80211_vif *, const struct ieee80211_event *); int (*get_survey)(struct ieee80211_hw *, int, struct survey_info *); int (*get_ftm_responder_stats)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_ftm_responder_stats *); @@ -1048,7 +1048,7 @@ struct ieee80211_ops { void (*offset_tsf)(struct ieee80211_hw *, struct ieee80211_vif *, s64); int (*set_bitrate_mask)(struct ieee80211_hw *, struct ieee80211_vif *, const struct cfg80211_bitrate_mask *); - void (*set_coverage_class)(struct ieee80211_hw *, s16); + void (*set_coverage_class)(struct ieee80211_hw *, int, s16); int (*set_tim)(struct ieee80211_hw *, struct ieee80211_sta *, bool); int (*set_key)(struct ieee80211_hw *, enum set_key_cmd, struct ieee80211_vif *, struct ieee80211_sta *, struct ieee80211_key_conf *); @@ -2406,7 +2406,7 @@ ieee80211_remove_key(struct ieee80211_key_conf *key) static __inline struct ieee80211_key_conf * ieee80211_gtk_rekey_add(struct ieee80211_vif *vif, - struct ieee80211_key_conf *key, int link_id) + uint16_t keyidx, uint8_t *key, size_t keylen, int link_id) { TODO(); return (NULL); diff --git a/sys/compat/linuxkpi/common/src/linux_80211_macops.c b/sys/compat/linuxkpi/common/src/linux_80211_macops.c index 04f9f6d7e7fc..d9e82a6d64ee 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211_macops.c +++ b/sys/compat/linuxkpi/common/src/linux_80211_macops.c @@ -102,7 +102,8 @@ lkpi_80211_mo_get_antenna(struct ieee80211_hw *hw, u32 *txs, u32 *rxs) } LKPI_80211_TRACE_MO("hw %p", hw); - error = lhw->ops->get_antenna(hw, txs, rxs); + LKPI_80211_TRACE_MO("TODO link/radio_idx"); + error = lhw->ops->get_antenna(hw, 0, txs, rxs); out: return (error); @@ -121,7 +122,8 @@ lkpi_80211_mo_set_frag_threshold(struct ieee80211_hw *hw, uint32_t frag_th) } LKPI_80211_TRACE_MO("hw %p frag_th %u", hw, frag_th); - error = lhw->ops->set_frag_threshold(hw, frag_th); + LKPI_80211_TRACE_MO("TODO link/radio_idx"); + error = lhw->ops->set_frag_threshold(hw, 0, frag_th); out: return (error); @@ -140,7 +142,8 @@ lkpi_80211_mo_set_rts_threshold(struct ieee80211_hw *hw, uint32_t rts_th) } LKPI_80211_TRACE_MO("hw %p rts_th %u", hw, rts_th); - error = lhw->ops->set_rts_threshold(hw, rts_th); + LKPI_80211_TRACE_MO("TODO link/radio_idx"); + error = lhw->ops->set_rts_threshold(hw, 0, rts_th); out: return (error); @@ -436,7 +439,8 @@ lkpi_80211_mo_config(struct ieee80211_hw *hw, uint32_t changed) } LKPI_80211_TRACE_MO("hw %p changed %u", hw, changed); - error = lhw->ops->config(hw, changed); + LKPI_80211_TRACE_MO("TODO link/radio_idx"); + error = lhw->ops->config(hw, 0, changed); out: return (error);