From nobody Thu Oct 23 23:37:16 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 4ct2WK1jW5z6DsG7; Thu, 23 Oct 2025 23:37:17 +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 4ct2WJ5Vwsz3Rjr; Thu, 23 Oct 2025 23:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761262636; 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=eg4vdG/wUoA8mLK/U3sRAQRFco1Oe+J1uZ1i+QVruKA=; b=GPuH7mK52Vh67muYyUFcT4e1y07RiPE+QWnZf5d2nUqewEextgX8HDpmya7TRlo4AuL7+c 3uJS0z/+/zXUvF20QtQHjRddukSTK0bPsC1oEkgHMTzacLefqoByBmT003cMZqB7bJ0IvM dByzMuaBmu7om4+zoAX53tJYAfhZFdAv2qlSBh384kt4uUjDhYtBmKRmTaCPMzZqbWCmRo XL3hvKk8OSDO8b4pycWzU61rDLFIROQ3wvvyO4YFJmPmdE+m+PL1wSQcBMvSn1eTGtF0HI dv3Vd/OWe6OLjt1993io5o82KUzIJ+WwR3JrsazZMTsANXx6beJg5akoAdYhPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761262636; 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=eg4vdG/wUoA8mLK/U3sRAQRFco1Oe+J1uZ1i+QVruKA=; b=x9T9KeoM1W7denzmsOGX3B1GVtM0DmJWKDCH1AVyvCdbZFbZCL51CoAQ0uviUZX19rKjvu 1ITOkmJJddu4fkupUWRxNAqq0K1wBK4suGv1v6OtLIgEm0XjWm4FwYnmxyb0Xw6fgA2gTf 6j+eM0BPFBza8hwVWDMcIZKXxRcx4RWfDz3al+ZtlzQZWcg2Mm0iO6jYkbgxR6fHZnnUmd vwkHBvTsGfYEwtzYus12xsD82MiCcIFbohMA5ANUtkDsbf8vKI4so7V9wSnVDOmB3a9dsv /a3WPLJXHl4AG6LSpiK1h/sgnCMg2wbfFty5zSbQT29BPYrofFzt9FuoRtHHTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761262636; a=rsa-sha256; cv=none; b=pYinmyTPiJ3Ad63bHeodH5jDvgHMDDZIT7nAVUTdVIlgHabm1AvqH6PrZzIy/U/OzYL7Ni lIwQbedYLV5auoHqFSx5kI98GNiyQ0CAq4jWKL0YQqx1qUZmWXsy4AjSqjOEmNa6Xdh4r3 M15aEtQsaTUKY3lQQldqNo0opl3Fme7XQKQKGZ9Zq1GwJ0Eo9WjMQOqAq6/8O12CEDP71J Yn00NH2N95Ycbi7d0t9PS9Rtp908IP3J8/GM2dujZzUx2hT6hQ4cdvy/kA0+XUlU4Y8SiY KonHdJDjvkpFe4MVZQG+e159ikVLAKS6DojOPADl6ZYCJrPmVoo+PSlsDMTBbA== 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 4ct2WJ4t7pzcv9; Thu, 23 Oct 2025 23:37:16 +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 59NNbGv5026484; Thu, 23 Oct 2025 23:37:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NNbGZi026481; Thu, 23 Oct 2025 23:37:16 GMT (envelope-from git) Date: Thu, 23 Oct 2025 23:37:16 GMT Message-Id: <202510232337.59NNbGZi026481@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: f6fe2cf64f94 - releng/15.0 - LinuxKPI: skbuff: add a misplaced socket operation to skbuff.h for now 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: f6fe2cf64f944b0201aa119bf4d0907ee04d8d00 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f6fe2cf64f944b0201aa119bf4d0907ee04d8d00 commit f6fe2cf64f944b0201aa119bf4d0907ee04d8d00 Author: Bjoern A. Zeeb AuthorDate: 2025-10-11 09:25:08 +0000 Commit: Colin Percival CommitDate: 2025-10-23 23:32:21 +0000 LinuxKPI: skbuff: add a misplaced socket operation to skbuff.h for now This likely belongs in socket code which we do not have in LinuxKPI. Needed by a wirless driver at v6.17. Approved by: re (cperciva) (cherry picked from commit 88dbf83345feefa7181bd6df47786e1a8d1d304d) (cherry picked from commit 3ad05fa24a240011a8252140ff6431cb0b7879d9) --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index 6e41c368a8b8..2e560a120e41 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -1159,6 +1159,9 @@ skb_cow_head(struct sk_buff *skb, unsigned int headroom) return (-1); } +/* Misplaced here really but sock comes from skbuff. */ +#define sk_pacing_shift_update(sock, n) + #define SKB_WITH_OVERHEAD(_s) \ (_s) - ALIGN(sizeof(struct skb_shared_info), CACHE_LINE_SIZE)