From nobody Wed Jul 10 10:17:47 2024 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 4WJv1m0QmTz5Q8yQ; Wed, 10 Jul 2024 10:17: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WJv1l6zx0z4322; Wed, 10 Jul 2024 10:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720606668; 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=NRGsfh4RoUYZWMUBsUskxHdFpxppVIdNJ4RV8XSj2QA=; b=ch+uJmzZ1c/2mSFGXUFwDXzia4DL2O0sDXoQNsOy0SxTkPDdDe9cB8/jeaXDfijFllFOR2 yYgGsNh57NKIqF8zWmxCmzKzuAPmoMeIvlJ9bsAEFKMOCwiBE+KvCo/NgVOOyWOaiQNwxL eTU23WOFluUCLxWLXGcle+5fdpqOcya46O1l3ayeAiK/OslnRMnxcgIzcVDTWtN7ANjtms ojIQgSbCk853I+4cyfOlEX7rwHep4ob2ilhWfqKD6LzbtrGOZ0g49umMI/YfxpAQknqgNF Lfv/zcrVZsamAGfAjSBuciiws+oC67Nba/PuBBb9Cvn1ggycdE41qwb40QZkoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720606668; a=rsa-sha256; cv=none; b=HIu2/7vUY73q+wM3warD0ZWy9RJa4aZYwHS2SCA7YXUn2gkiDwMQ9BWyCWq9Zfpo9SZjWM tr2JUIpbzsB/U3xpzpOHL4VgC4KhnsdQIPcdUPnraj+LjOPK80ktG2Sk+t2+LCL+RdDTme /Db0fQ7IzKTHm0R+kTIHAoP9FqQCVra9JfFOi554u5qSHR05Zu3F8OBxBsO5hG+V+BHyun Q67iXk8jGuHg8WDI0Vx/E/6CZjRjomIRq9CsbBV17ox6oBxV0h9NL5tTiNwVWIeGHX91B1 80aOAYHZGTSHsSAwqEdA+br2rF524+4w36NTLr/V/oe/XMDX0dCYbNNKiVemqw== 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=1720606668; 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=NRGsfh4RoUYZWMUBsUskxHdFpxppVIdNJ4RV8XSj2QA=; b=SbKWq52dBCl0fjbkwDcd6I5gyNeuiI+GTz4vFyGf1iqQbShnm89OPU+A1Tn7QHFg2JEyo1 ppdyhhbYq634uO4UopKA1WQvRQFPK4liOJP/tWikEqh4rYUHMFsnCjPbY3C/zaAngXWFWE jNJKoviTvS6OHA0wuQIWwiqmJgojc5sUIWXX5dSOaMLxScU1AIZPtEXtX/7r/c5GR6V9sP PglBeJIrEWsJDBFOu6By9rED2LY9u4PS2tcwapomdlRTiWjuqrRhRruT5Jbb72ModGrouo cyEds9VzVWEulGde73bjGFC7zz/HSYh8zyjOpaNEy3Os++1RXGa37Yrcj2S8rg== 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 4WJv1l6Zszz1CH9; Wed, 10 Jul 2024 10:17:47 +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 46AAHlIF070924; Wed, 10 Jul 2024 10:17:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46AAHlFj070921; Wed, 10 Jul 2024 10:17:47 GMT (envelope-from git) Date: Wed, 10 Jul 2024 10:17:47 GMT Message-Id: <202407101017.46AAHlFj070921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 7de38cbb5dc4 - stable/14 - if_vxlan(4): Exclude ETHER_CRC_LEN from macro VXLAN_MAX_MTU 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7de38cbb5dc4d0a6de65eb562a1b066313dc756a Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=7de38cbb5dc4d0a6de65eb562a1b066313dc756a commit 7de38cbb5dc4d0a6de65eb562a1b066313dc756a Author: Zhenlei Huang AuthorDate: 2024-07-02 04:57:01 +0000 Commit: Zhenlei Huang CommitDate: 2024-07-10 10:17:09 +0000 if_vxlan(4): Exclude ETHER_CRC_LEN from macro VXLAN_MAX_MTU The encapsulated (original) frame does not count in FCS as per Section 5 of RFC 7348. Reviewed by: afedorov, bryanv, #network Fixes: b7592822d5de Allow set MTU more than 1500 bytes MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45195 (cherry picked from commit d6963b9ed3287e91db3d1df153861591faff0007) --- sys/net/if_vxlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index 87648abd116b..7a8cf7acae58 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -98,7 +98,7 @@ struct vxlan_socket_mc_info { 60 /* Maximum IPv4 header len */ - \ sizeof(struct udphdr) - \ sizeof(struct vxlan_header) - \ - ETHER_HDR_LEN - ETHER_CRC_LEN - ETHER_VLAN_ENCAP_LEN) + ETHER_HDR_LEN - ETHER_VLAN_ENCAP_LEN) #define VXLAN_BASIC_IFCAPS (IFCAP_LINKSTATE | IFCAP_JUMBO_MTU) #define VXLAN_SO_MC_MAX_GROUPS 32