From nobody Fri Nov 17 12:20:31 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 4SWwwJ189Sz50vPc; Fri, 17 Nov 2023 12:20:32 +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 4SWwwJ0XR5z3Mp0; Fri, 17 Nov 2023 12:20:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700223632; 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=5Vy5iCMvFXUKjtgjLCj/9MnMPyv6qDUKLUTHlzcOYGQ=; b=pdxHDOuwS+BKhHl4L58EtgQ7jq3sJn34pDYhiClJVal2ILNutLRcRkDOx8NTB+mdIGWgWy U0sM0btDXnvn/Lx3S6louy4/V/155UndgZ/I8OOLftgYgpnqRxpr+o53JeODBpK0GEOpwv OiUE65r0fwnIiGufwxgxl406E0x8FxCaF3hC+TrJNIAo27mqnVxezKFf2OU5/yG/M5DZb0 fna3XAlqvkDS1m00Vv8qhKz7X+SADwKkcUiju1SvV3AOISsDQhp4SDatsfZX0QbUrl7hTu ir9pyiqtr3qE6SeS/gbHj/TDiLYs+VBDPioqrrzg1pMx+cJdBZwFCs9fRLoyng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700223632; 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=5Vy5iCMvFXUKjtgjLCj/9MnMPyv6qDUKLUTHlzcOYGQ=; b=NX4pdZWbD1r5ovztd99cmaI+lqe9VYhHo+VhpBFmULmypK913GESyK1nx6YU7CVcm++SYt N12WnRTcTmI0UesaYPg6hqW+kgQo67MIqFIkqzleBsxCQAm+x3lYw8qnenh1ehL1b0Nt5g 0Tr56zzutJycUDi/9zUS8vAvog92+DI7+TTqWWw9//7Jeo3t5w8abHGy3DnoGzWB02EkgK BFsHi98HTCpDEZog69Y7DBSHTTpuIF4GdQN2aNYS04/H22UwIt7c69Bd3K6rvpfbinwDQb ZNPTOHxEcmwd0bND0BRhxs8OhOSCP2nn/V7WG1YeHKHBld+7tbUVBEkwMVE6Pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700223632; a=rsa-sha256; cv=none; b=xCtAWp8/XlcEtpvv/oyMC9nqwMPX84QiB3300ddNRUvAUilVSv2YQ9Sg3S6qj1e7lGusow omYcoEeCT9o2UlTSRxv2Y43MTH3fXXxvQResygPXkKZTCn3FLAMhEFecFpFmjJT2sB33pB +TUNunn5nFT6ShIFLNoGmaZPMhKECiDpgUxQnAP7c3fqmWDJA2rQYixpiPekGdZyM9RYth HhzRJa+3OSGrgdBOcY/FBdvnCimOq3z2b5uQj5Dx7UvIusZ/P3bGuDz2Qp6xhKddKDNO6K oSUPJe7yxrWKTqlDo11IMRpwb1vI+On6A7tadsPfIp/qOaaNrKUo+yqlf34p0g== 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 4SWwwH6ZSpzjPN; Fri, 17 Nov 2023 12:20:31 +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 3AHCKVnG099816; Fri, 17 Nov 2023 12:20:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AHCKVEk099813; Fri, 17 Nov 2023 12:20:31 GMT (envelope-from git) Date: Fri, 17 Nov 2023 12:20:31 GMT Message-Id: <202311171220.3AHCKVEk099813@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: 0480dccd3f34 - main - dpaa2: make software VLANs usable on dpni 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: 0480dccd3f347da0dbccf5917633435d5ce6cb86 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0480dccd3f347da0dbccf5917633435d5ce6cb86 commit 0480dccd3f347da0dbccf5917633435d5ce6cb86 Author: Bjoern A. Zeeb AuthorDate: 2023-11-15 11:46:44 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-17 12:17:54 +0000 dpaa2: make software VLANs usable on dpni dpni announces IFCAP_VLAN_MTU but internally does not increase the maximum frame length. Createing a vlan interface on top of a dpni interface will result in full-sized frames not passing. Extend the maximum frame length by ETHER_VLAN_ENCAP_LEN to allow at least for one layer of (software) vlans for now MFC after: 3 days GH-Issue: https://github.com/mcusim/freebsd-src/issues/22 Reviewed by: dsl Differential Revision: https://reviews.freebsd.org/D42645 --- sys/dev/dpaa2/dpaa2_ni.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/dpaa2/dpaa2_ni.c b/sys/dev/dpaa2/dpaa2_ni.c index 7cb472f45ee4..b274d5670d5f 100644 --- a/sys/dev/dpaa2/dpaa2_ni.c +++ b/sys/dev/dpaa2/dpaa2_ni.c @@ -2556,7 +2556,7 @@ dpaa2_ni_ioctl(if_t ifp, u_long c, caddr_t data) /* Update maximum frame length. */ error = DPAA2_CMD_NI_SET_MFL(dev, child, &cmd, - mtu + ETHER_HDR_LEN); + mtu + ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN); if (error) { device_printf(dev, "%s: failed to update maximum frame " "length: error=%d\n", __func__, error);