From nobody Wed Nov 29 16:38:18 2023 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 4SgQ4B2Z4zz52wZF; Wed, 29 Nov 2023 16:38:18 +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 4SgQ4B22zQz3J0T; Wed, 29 Nov 2023 16:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275898; 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=G23zh+1sk/D29ViOFW86Y0Eb/TjCBR0dbFB+OfsUP9Q=; b=DabCcSb6QNIWJMTSVf96Ayz3gbSosSSkWh55nE55xyARBks5rap5yUUPN+RGW+H9jaNtjt rA8a8OJxbdiha1w1ZThIHmmiEYCEjQMfa0Q/0qeLkGa1AZ1+JEhFCpTalHWKrz85heZ/V1 ZftW2l2zeLu4EO6lB2pye83chOAoWQng1fT2jacLZVTzswNDB+42fpLXKm9D4zObs1Zp6R HtJaJLvuHRp2RnARQ0qYehpPQP+62yaoa453343VAmuujiKFSjWasfMlXL93vW1Cs80os5 YG/HmwX6m7jdO3wqzVGOAqWji//8AqmJOl+aIwTI3ITQ/231fOY0KXxdhd+pFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275898; 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=G23zh+1sk/D29ViOFW86Y0Eb/TjCBR0dbFB+OfsUP9Q=; b=MXsLW920mQO1OUg4QeYjdwwXifJ5erAPjSCCUAl6qDFPcYgUQnJrZVP+kRaZauFB98ZV9r 0rjG/a0vMo8FWq98wf11LkRBzXNQAUn5wiiPibE3JStWGSRUSSt2XzrUcSWpM+0gmtawLJ D8HuwlX4WKzLbKa4iXRaHdFmDcPFjFJWFCdmDx69Qo1lcVlNlqpxaMaPAYvJengroyIKkg Dz8ssbv0vqThzIU7An2jXPrY0GIB4s3CWTKVhQkNhnCn84QA/DDVM668RVBElVOqFKEvmK mJg5hxKKuhIJ4/LV+ov89uLKoaLSfQnCcb46dseG7gndTAW7/mSyKO5AGXkMWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275898; a=rsa-sha256; cv=none; b=W2DV/FkryIcGCX6FKMj3IxuJQx5iD8mXxljLBhazlzXIEZ0LhtPnaxSIRLtyyTrgqLIaVd GqACtXG5tSPoFXcDTg3UaIu5D4tWKpOKWjVMi5B8h7zUt8k96HLMbTljaqkqxh7tRJ2oZA L9Tk12mu9dt/WyMFUXJQbMehVbkN1hgGbK5PhN8WA8bi+sBUlbcmrX5/9CD8pre7XA7rzW gLNN1eWADlVGrTpnkjvHtMoPr8EztgAE8f6yuv5GLUlDJu91AMlZmkAEhlgkfgRp2EOI/M Dsd95XT1m/pT8aoLVSQia1guvbl3KNnhvgAmkZprSoGxyCqzp5nUsi4lmFzyyw== 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 4SgQ4B1417z1C2H; Wed, 29 Nov 2023 16:38:18 +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 3ATGcIxo045473; Wed, 29 Nov 2023 16:38:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcIH5045470; Wed, 29 Nov 2023 16:38:18 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:18 GMT Message-Id: <202311291638.3ATGcIH5045470@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: a7b3d5f7dcb7 - stable/13 - LinuxKPI: 802.11: prepare for iwlwifi driver updates 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/13 X-Git-Reftype: branch X-Git-Commit: a7b3d5f7dcb70185ef0b3a986d7464a02483bd9a Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a7b3d5f7dcb70185ef0b3a986d7464a02483bd9a commit a7b3d5f7dcb70185ef0b3a986d7464a02483bd9a Author: Bjoern A. Zeeb AuthorDate: 2023-09-14 17:31:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:06 +0000 LinuxKPI: 802.11: prepare for iwlwifi driver updates Unconditionally enable the changes for newer drivers, as needed by iwlwifi (and others). Sponsored by: The FreeBSD Foundation (cherry picked from commit 3e1f5cc9a81a6065ddc371eea5755b4e207d72f8) --- 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(); }