From nobody Mon Sep 11 14:32:01 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 4Rkq0x45hKz4sG70; Mon, 11 Sep 2023 14:32:01 +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 4Rkq0x3hJwz3J3T; Mon, 11 Sep 2023 14:32:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694442721; 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=01Mzoe5lVqrEwaQgL/J040Mj2XJpwamxenvO+6F5k3s=; b=ChK/OrCM7wbSaBKHyDoH4jDj2vjPw5/aWnqcGAItktX7ScKMxdzl83lUtqN8CzDf0qFUeC jLZizKLxMhGhuIjxoOx0rMTLuDmAOrRylYl93YcYdtHWDKzO/lmwBqECreHWDlJCvqAIX9 G9SdKsTJAwa3XxsP10M2peoAj/1oYxArOzjHRuuPSlFDqBzbohBkCEa8yMBmnGoWQCzuAm IWzNNFFEoFF6H9jHV7SNC5EVXOZA4bauyaTAtDRwhURF//WkI+B3/dHLlqvxh27uR4fGqW WO5KwAR/tZks0jAM18t2IFA7kK+g8/k4o9jVc0Y/NhhCXAiEfKkvXIfcSXVCDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694442721; a=rsa-sha256; cv=none; b=SAk8C3T4eJ91pU/wKMR+WDA2bY7rg6m4KHp3/AxKQAhzukW6zj7k9ZiUTHc00xEpBnkQ59 lUwLZkOQ3bvPO4lAUOet+2tNWYzEwal+rJMK1ezxOEszCwyjveqzRR6hjncA2A96vnaOI/ xXgC6WquD3BmIJL0oNx5i0Ge3gfu25eQI+Si+DL0zQ3wo9447i72zC9+73nBlwD70YkP75 qPkjbFxCB2CtQiTrYF0BYYsouItW34eYF+SSHnlJvx8vk8pUxN/ZI0bgSleDAFyV3SlBtG auvqXVqLBQJJRG0i+dXXaFfzM3taDq9GrGjT5zS9ihbTStFbLT/lszvZQOo9Xw== 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=1694442721; 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=01Mzoe5lVqrEwaQgL/J040Mj2XJpwamxenvO+6F5k3s=; b=bXl/md8B9rJTPjFrDi+U596qgjkeLjtvsWLT5WqTJkzjtiQpUpdwjNoPERamRycGR3QD7y GdDamOeSH3N4VCLGmwiC1J9fCajOSOcA4Fk8hy1MAq+7TSjbLWbLoQxMcJGfAOhiQrC1kX NVDL7i1s0hBIKO2hzB1dD7eHhNLO1RQe6Wf5LwYmjm3BVPN+P9lH6Fij9+IxEH5jwgtMqY V5xoj4gkbJIoFxuS3Skj8EYxECCnNUOGwkZKfISeh1KARblAcMJQ0fWEtlvLUNoGrNvaoI sRfk1gZuguGDiohvlhNRgBl2rJZeAYUCahq2F6lWTThbxgdmk2mvm1y+smjnOA== 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 4Rkq0x2n3VzsbY; Mon, 11 Sep 2023 14:32:01 +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 38BEW1Zd054761; Mon, 11 Sep 2023 14:32:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38BEW1Ep054758; Mon, 11 Sep 2023 14:32:01 GMT (envelope-from git) Date: Mon, 11 Sep 2023 14:32:01 GMT Message-Id: <202309111432.38BEW1Ep054758@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: f0e59b6903c8 - main - 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/main X-Git-Reftype: branch X-Git-Commit: f0e59b6903c881859d7f4eaf269b2336b774c7bc Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f0e59b6903c881859d7f4eaf269b2336b774c7bc commit f0e59b6903c881859d7f4eaf269b2336b774c7bc Author: Bjoern A. Zeeb AuthorDate: 2023-09-08 12:47:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-11 14:31:35 +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 MFC after: 3 days --- 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) {