From nobody Mon Oct 9 23:16:06 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 4S4FJk6yyMz4wgxF; Mon, 9 Oct 2023 23:16:06 +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 4S4FJk6SKNz3PwN; Mon, 9 Oct 2023 23:16:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696893366; 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=wsvMvvpMmWmpiZKs9LfBbkrwYpiNT9/lN3Ww+ilRM+c=; b=xlzcB838awuW+K5F5qSVDeLvxkgjaDHc7c6gWKtpHEEv9HbLmAR5+6sHj9nPHzYwqzQuit Clbysta5MNyuNkVyIVoz9SB+xALkwe1JwnoAmeJUvlYQ5KXc9Ai8AMRVRHYpNdzMlA2JaR x0I1uS/9xn9GkXftCaOiprxxIXw0iS7/6reuP0KrGpBHUKqDqM6uHj/MNDKKuyod2Wcty6 pmvdqFxuD/+3UwYlEnufwU3rxd8Fk5VOohiXW16D7KhRWWPmHqaqDUbsd5QQJEiEJCNN29 0JSuRJ3d+IrChPWokrrgYM+0TRPGcRF+kEiZJtT48+U8lJ1EkxZjk5C2jsJtQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696893366; a=rsa-sha256; cv=none; b=GHCry4BKUqvE0/97MssmSMUloDHbSYPB61VUlPNuT8nIKgk+kc4pzNLstfbSHmTrvVkYP8 TbQMnJa/UzY/WN+4JbCXYk3FQJgYW6yNMZbjA+/ANLdymqYpJ7tH2GUirTkyx9q6gSDxvQ YCbI0y1XL3kp7C3uzSukjN/QxLUttjC/fJiaQnmg6n17rNPtJElY0Y7aZQ69tg2kbnrbXQ zu73aG0ox7vhWOU99FbC+KOUXBao4nIbCmmCOUf/ot1k4c+afENA7jzppRWjVQO4EBYXo+ z+QSEeuEcx9wVu6LhPNEtw4tdCtG14/u9yBLTJa2Fi3OCQNXMSqz3qx53Mt2yA== 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=1696893366; 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=wsvMvvpMmWmpiZKs9LfBbkrwYpiNT9/lN3Ww+ilRM+c=; b=Iwr9YFtSA8qW6rK3AX5q3l9c2JCHqPT/m6WgeUYfb1K0qVqevnWnJ8bh2WjnGA4C6ky+E9 C1azFA5YNue+K8UuVmAaQgjdtORlYwXwi9pMLEcRrqbKFy3g9xy6WyS+eoIVGf4VwLXg0Q FTCcq8Y5amV+qEGuzdzWZA4mmbNKXE3bY5AhAjSkQQGX0ICfnNlV34CeyvRqkcwlMhDojH TNxtGDCkgzc9EPUT9pu7IYp9WOYiYBYzM3Qn6C16OTx329el0e9gAZC22PVM2l7+W5Z7LV jkeEiMgvRFk3OLhduGu/VTddUBZJH3hFF8Vzr2uKxnODeUfvdm7KB+cXmcqYBA== 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 4S4FJk5YNkz17D; Mon, 9 Oct 2023 23:16:06 +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 399NG6A1070884; Mon, 9 Oct 2023 23:16:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 399NG6Zf070881; Mon, 9 Oct 2023 23:16:06 GMT (envelope-from git) Date: Mon, 9 Oct 2023 23:16:06 GMT Message-Id: <202310092316.399NG6Zf070881@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: 90876d4c6939 - releng/14.0 - LinuxKPI: skbuff: remove assumption about mac_header 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 90876d4c69393fc926d50320c31d5fa5ac3904d5 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=90876d4c69393fc926d50320c31d5fa5ac3904d5 commit 90876d4c69393fc926d50320c31d5fa5ac3904d5 Author: Bjoern A. Zeeb AuthorDate: 2023-09-08 12:47:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-10-09 23:14:52 +0000 LinuxKPI: skbuff: remove assumption about mac_header It seems the mac_header can be set to offset 0 for frames received. Remove the warning splattering messages to the console for each packet. Sponsored by: The FreeBSD Foundation Approved by: re (gjb) (cherry picked from commit f0e59b6903c881859d7f4eaf269b2336b774c7bc) (cherry picked from commit 46e5d2b0c6e01fd0789a6ef543c8b9f52852301b) --- 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 c917b3f09ac9..f8ce212e7853 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -935,10 +935,9 @@ static inline uint8_t * skb_mac_header(const struct sk_buff *skb) { SKB_TRACE(skb); - /* Make sure the mac_header was set as otherwise we return garbage. */ - WARN_ON(skb->mac_header == 0); return (skb->head + skb->mac_header); } + static inline void skb_reset_mac_header(struct sk_buff *skb) {