From nobody Wed Jan 18 16:24:48 2023 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 4Nxrh05Y4Lz2yJWL; Wed, 18 Jan 2023 16:24:48 +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 4Nxrh052G0z3Dn9; Wed, 18 Jan 2023 16:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674059088; 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=4rwU734/YDibAi2UlCJ+QsOEski/QxX2xvvxFtWbAyE=; b=iTUhb7Q4q6yqnjh9zPT5HqlOQdNRKPqTnuviRp9NaDtDPPFJWFgNHctXOk1MJCf9JH8Zv8 Tg1cMpODIfJVGSvojSOxx1a43c3nu/sOb8FSbFfqoMqJqAoE7LufxbVdBJgVQOhUZzLW40 r4o+Fjxgl1VSzTgSFaducusTigBE3hS6nsC69UzR4dbEtCww5lAoQPrS17CwzxtjZxZJEu MQHv0UyrZ+Shn5JfJz7pIC4O8lcFEUwwMTKkPmLHTm6ZZNqKV3Pm9Uh0Sl2tl8uDN0LM/F 8bxtOtc5uNnYhot8asdzpfUrF2YAvRVCyuxnnaBCYcau2R8OeNUYfmjcVdfjGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674059088; 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=4rwU734/YDibAi2UlCJ+QsOEski/QxX2xvvxFtWbAyE=; b=RSRvulGk/nx/rsv2GSojgGvbYjbF1RWYOK6ToECA2hp7tleKo18JAK+WehHFwwahJywr/R Aba93ob/vcsQrrvwbUtzuc/oKtvFZD/xeKZu3H0NakKK6u/CwnJ+ZonRLl5wx1jANNJylj w/LwTw3Fn0RkuAOLBnAvipWamcmNkmnC/H5fPpmBCFrEqaj+LnG3LvzY3zrlgw3CurwRXl kXRVCrl6dR3P8Wp8fA+sTN4Wnr3AcOdlDqpafHwSLMI/Om8V0AbphynaM9pfKLdcGFMfpZ Anu5fe27D+v1UH3qxZyqYUMk1i6KCzEDcgUbpXmehJRpJpQZroV+eByCPfPh1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674059088; a=rsa-sha256; cv=none; b=HEB7UyzmCk7zyM46QyxGProfgSkEKQjUiIFlTl5Mk6/OZQiqPumA6+s8tWl+yWm5jeurq9 J+rC2kEfEzi/E3HAzloh+W+YDcY4qaeYezdW3ytM7V7+0USWvECn8MSi9XAn6GaKcKOcTt 2ZbcSdP7zMoq4ZIshzukdCO/OMwwJZPMFsz8pmAPi69tIKIBFDzmyry2c8ugNTi1ztZJr4 /nPGda1MjOPlacQlDQj318JCsnlw2YYeD7JptsBY1BYNyjKjNS7qDDePSzRKhJq3uAbitv x4MsiRcDZJFBJsXneeUT5QjE0jJcKSFzPO37l92gdi0aKfsD/+vRIb2eyUPv2Q== 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 4Nxrh03nmpzHbx; Wed, 18 Jan 2023 16:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30IGOmob037909; Wed, 18 Jan 2023 16:24:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30IGOm76037908; Wed, 18 Jan 2023 16:24:48 GMT (envelope-from git) Date: Wed, 18 Jan 2023 16:24:48 GMT Message-Id: <202301181624.30IGOm76037908@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: e75ba4c620ff - stable/13 - LinuxKPI: SKB: implement skb_peek() 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: e75ba4c620ff9169c29a89274810cb2c332efecc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e75ba4c620ff9169c29a89274810cb2c332efecc commit e75ba4c620ff9169c29a89274810cb2c332efecc Author: Bjoern A. Zeeb AuthorDate: 2022-11-28 18:47:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-01-18 13:24:11 +0000 LinuxKPI: SKB: implement skb_peek() Sponsored by: The FreeBSD Foundation (cherry picked from commit ce9f36610ea9ff29d42a2bcfed44b020c2e56dcb) --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index b54f5a91769f..35d5a1fd9b80 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -571,6 +571,18 @@ skb_queue_tail(struct sk_buff_head *q, struct sk_buff *skb) return (__skb_queue_tail(q, skb)); } +static inline struct sk_buff * +skb_peek(struct sk_buff_head *q) +{ + struct sk_buff *skb; + + skb = q->next; + SKB_TRACE2(q, skb); + if (skb == (struct sk_buff *)q) + return (NULL); + return (skb); +} + static inline struct sk_buff * skb_peek_tail(struct sk_buff_head *q) { @@ -930,14 +942,6 @@ skb_reset_mac_header(struct sk_buff *skb) SKB_TODO(); } -static inline struct sk_buff * -skb_peek(struct sk_buff_head *q) -{ - SKB_TRACE(q); - SKB_TODO(); - return (NULL); -} - static inline __sum16 csum_unfold(__sum16 sum) {