From nobody Wed Nov 29 16:38:02 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 4SgQ3t2b58z52ws7; Wed, 29 Nov 2023 16:38:02 +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 4SgQ3t1rDWz3Gn9; Wed, 29 Nov 2023 16:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275882; 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=rUkulMAJ0lZPyYR2cQFSMNc1ggv/21FBpxBjRCoBbHA=; b=LAIRiv31b9kRkX/913WXdDvX57MKe+A1+hQtMPlWnaaZOaQh0PWyNpn2EzPxjWipaSDMvk JBvXCGhzVaY6uXV9NvmXuLTQmzYISiw4eydqU4ukt8hpgOeN4xvTjwrFkNpdATiWzFoI9O +Gd+OdHEgszq+MObw70JmdodYPXc47x28IrR2t8jm3flhGvHJ2Pp8qf+L8nCZVOge/ylvw Xapq++Ges06j09oOb/iDeSWLMZIvcgo5RIlWnoLmKZ3o9QNQQviIaNzBsmL84r2bKUjMVQ xAhBodWLJgLqh+0XSTGpSD5uSUjiodAknNFPemfoY2ZOOIu4ACRpkQLHLT5TOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275882; 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=rUkulMAJ0lZPyYR2cQFSMNc1ggv/21FBpxBjRCoBbHA=; b=JKmkDjENtuLQJP5b+JB7tpi/3VO0a512jczznRxKf4Bam7bg6N0CT+84sKTF7LGcU/Vqmo Z5DqMz5ZXSRquCnV+f7prDxhdF0kRQ2wEIBcXSXV07IZGfNUR/Lc2sazIjJlxYFoCYnUy5 3+d/C+VZcsTNM05ItdktNey+JH3BPFkWMv4BL870qYeJeX/2RAm/x1x9GxNXRYtwbceApj vFmTEFzCWkGpw4rAmAzVBvrqRRWe1FgIe5eUkUR5UaSaOtWPE9yJXPWuvigKDiv5+6DMP+ /dAW94CcnliXQFaMDS48OG0721001G5BeyDdMIw1ulfBYKepegcDnDSLENCW3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275882; a=rsa-sha256; cv=none; b=oHg4SQy8J5cEUj0RS8XVUySlrP6b2hX9nn5QbCT8OTz0c3OLwUeCVfp23pixV7QbLvJpA1 epe+y/thrWdA1xh01AURfgDpqz79N2/oVGuuqgpJTARf4IhsikowWTbmKcr/P8Hu4sXcxd bQ0sdSAEMKLXsBmp9NvsBKDGhw/qpp+nV95QDlm1uDSJj/u0kYAR78PBkUhN2DY7jkmCQX LN6M5ao46S5T2EaUnoJaE1HlYkB+VpbZznvD2LMJ3XTUMlmtjO8CNdTZ3DJuJpqgLNMioX cCI6X49VF6x4HJUwg6pgZLpklw57FVRfFY3YIh22Pws3Tuu2VwT7u1VVrekiSA== 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 4SgQ3t0xqLz1CXg; Wed, 29 Nov 2023 16:38:02 +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 3ATGc2YQ044773; Wed, 29 Nov 2023 16:38:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGc2lJ044770; Wed, 29 Nov 2023 16:38:02 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:02 GMT Message-Id: <202311291638.3ATGc2lJ044770@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: 88910886fa50 - stable/13 - LinuxKPI: skbuff: fix tracing 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: 88910886fa50a6eccdc7d263778143ddd68c61df Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=88910886fa50a6eccdc7d263778143ddd68c61df commit 88910886fa50a6eccdc7d263778143ddd68c61df Author: Bjoern A. Zeeb AuthorDate: 2023-08-19 04:50:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:04 +0000 LinuxKPI: skbuff: fix tracing Fix arguments to a trace line and remove another trace line until we actually will have the skb to trace along with a future implementation. Sponsored by: The FreeBSD Foundation (cherry picked from commit 149c457de14a06a40e0419d7a4249b1a3b01ae7a) --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index 5e5f7e4a0a69..6f48ac74996b 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -573,7 +573,7 @@ __skb_queue_tail(struct sk_buff_head *q, struct sk_buff *new) static inline void skb_queue_tail(struct sk_buff_head *q, struct sk_buff *new) { - SKB_TRACE2(q, skb); + SKB_TRACE2(q, new); return (__skb_queue_tail(q, new)); } @@ -1048,7 +1048,6 @@ static inline struct sk_buff * napi_build_skb(void *data, size_t len) { - SKB_TRACE(skb); SKB_TODO(); return (NULL); }