From nobody Thu Sep 21 17:19:30 2023 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 4Rs2FZ5dQRz4tk4j; Thu, 21 Sep 2023 17:19:30 +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 4Rs2FZ54sCz4dhg; Thu, 21 Sep 2023 17:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316770; 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=QeZGNBfv73bFpNZiKLatgbzI9ZWBcnabx/EcVOgLt10=; b=u7cG1kINSX8lUTj7j3lpAhA7kJXDzE3UDbD73Km3RwYsj9t7pHnFfymVb6P+Ku/2vTh4Ow mvnjCsncFoRTGO6ihTpfeIr0127W8Q0+QESPIqJqF03ejJbFPbKzIzQTGGosszvy88Jn1O Cc4iAaIbjxG9uNxSX8ZF4w6ijBJjk95dM3bes95XEFGINFTXPEGHput/GYZpicqJnHIpn5 hJMqDRF8+QQVTN9Ej5gDHPsJjCIFee9eMdVH/o+4xLIB/i8wa1UKuqNxUJKnNJnpOTMriI X6CK9Ho7tX7L4TsNFK3CmXEnwHT7npL5dxqTrmmDIHnAiC1jX7FZpYBcQ0GOMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695316770; a=rsa-sha256; cv=none; b=fQPEE57u1/aRQGgVH+NEc2WGTAB29K4zvp5WbU0in4ewjS7BSW5JH+77mwRldz4f4RHLgG hY7A6FK6XLjuDKFs2bHyM077C7oeF9o+R64Xj5NzEdTNKyg86VAgfPUEA8vA/ouDOJy/Qq sP8dqbrP4fchl4LT+DThIlMu+oqWiqq1fwR08dyb1gNW/7hjcDAGHpxc0yamdmPoQSwoo/ D+KUrUM/FOmyeud3PkyszPZ3d1fWQ1IVfGVNDRHn+Q5G4dt5e8vcCwLqyoa0gO5TSsZHSe i9/btE1wM5YQmXVaa/Jy3Ll6vP1Q22FWs7+jfkKzNLMYf1IyZQaaTLgEkIKCjw== 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=1695316770; 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=QeZGNBfv73bFpNZiKLatgbzI9ZWBcnabx/EcVOgLt10=; b=R+nLXl1beJ/BSrMubTxuuTBzwzQIzzbC9tRb9AGKAk7duPEz5HGVuZZ5gngckwApj5bB4D cDvlk4s4ql/Z6FO2ofukbeFCpE1iz0xEZyd03DKcyR1ckEtCjzjZ01cFJ6zDtRHYwZqfKg ZtgWUG1l5TbK6yre0oyHtiInA8tf9N6Lgc5m6c2pWtEqtnePgQAVO50bRccOwx0GT83xpn cYWYaL5QUQdZvnuqesDs0jap6oQPcUZovTQUG7wu8XirFPisc3bnTRmpSL2rlQUFLSfSkp FCmFXyBZG67ry7bx2pIAPYfn27EBHeofC6WgaOe+xNE0a7uSw3/SYUjLXGFW9A== 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 4Rs2FZ457rznTH; Thu, 21 Sep 2023 17:19:30 +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 38LHJU8S076176; Thu, 21 Sep 2023 17:19:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LHJUKF076174; Thu, 21 Sep 2023 17:19:30 GMT (envelope-from git) Date: Thu, 21 Sep 2023 17:19:30 GMT Message-Id: <202309211719.38LHJUKF076174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 3e1f5cc9a81a - main - LinuxKPI: 802.11: prepare for iwlwifi driver updates 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3e1f5cc9a81a6065ddc371eea5755b4e207d72f8 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3e1f5cc9a81a6065ddc371eea5755b4e207d72f8 commit 3e1f5cc9a81a6065ddc371eea5755b4e207d72f8 Author: Bjoern A. Zeeb AuthorDate: 2023-09-14 17:31:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-21 17:07:41 +0000 LinuxKPI: 802.11: prepare for iwlwifi driver updates Unconditionally enable the changes for newer drivers, as needed by iwlwifi (and others). Sposnored by: The FreeBSD Foundation MFC after: 3 days X-Note: breaks build until iwlwifi update (next hash) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index bc7f22f5aa15..20371812198a 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -703,12 +703,6 @@ struct ieee80211_sta { struct ieee80211_link_sta deflink; struct ieee80211_link_sta *link[IEEE80211_MLD_MAX_NUM_LINKS]; /* rcu? */ -#ifndef __FOR_LATER_DRV_UPDATE - uint16_t max_rc_amsdu_len; - uint16_t max_amsdu_len; - uint16_t max_tid_amsdu_len[IEEE80211_NUM_TIDS]; -#endif - /* Must stay last. */ uint8_t drv_priv[0] __aligned(CACHE_LINE_SIZE); }; @@ -1421,7 +1415,6 @@ ieee80211_is_back_req(__le16 fc) } static __inline bool -#ifdef __FOR_LATER_DRV_UPDATE ieee80211_is_bufferable_mmpdu(struct sk_buff *skb) { struct ieee80211_mgmt *mgmt; @@ -1429,10 +1422,6 @@ ieee80211_is_bufferable_mmpdu(struct sk_buff *skb) mgmt = (struct ieee80211_mgmt *)skb->data; fc = mgmt->frame_control; -#else -ieee80211_is_bufferable_mmpdu(__le16 fc) -{ -#endif /* 11.2.2 Bufferable MMPDUs, 80211-2020. */ /* XXX we do not care about IBSS yet. */ @@ -2219,10 +2208,7 @@ ieee80211_tx_dequeue(struct ieee80211_hw *hw, struct ieee80211_txq *txq) static __inline void ieee80211_update_mu_groups(struct ieee80211_vif *vif, -#ifdef __FOR_LATER_DRV_UPDATE - u_int _i, -#endif - uint8_t *ms, uint8_t *up) + u_int _i, uint8_t *ms, uint8_t *up) { TODO(); }