From nobody Thu Nov 30 00:38:07 2023 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 4Sgcjr2FcDz52Tyc; Thu, 30 Nov 2023 00:38:08 +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 4Sgcjr1R6Qz3MDZ; Thu, 30 Nov 2023 00:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304688; 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=U3WL11svBnYFfNa65AXIuewicGA/jB9x6WqpfEN4rWE=; b=NCEv7kB2z2W+aOS2CXLPcevBFMFeqrf/a2IkaZ6UpDcnYvQI9oiQ0MBo75sOx8pJe3FBgD OWBovhDIDOaYbxIbUbJi1PySfsfBb2n8jqbt7/QohhjTYAILEP6QcLZtTUe7sQx0xOysJ9 UQfAUH5Zn65aN+t6fiMXTcQXxcvsS6CC3I3CIYU0V1uWWjFe1tD1D1+sQ+hmu3I41+HnFl fkIlY282v5ZSqlRohKMUAqMLNlA/EtLo8Yata3RbTtrdsYEME/NxmfEmQzgfMeUHkCsHI2 Dm+kLjG8kYdolz+7N/ISo/Kew22Pu/vrHUUkFdQDdDkTygQ2bA5qFa41fj0Yqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701304688; 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=U3WL11svBnYFfNa65AXIuewicGA/jB9x6WqpfEN4rWE=; b=gokEjys7GnBpieGYXJULKBqGAgJod5LQh19FxBvf35mSz+YPtUzv0UoDpNtuQgj8c2Jlpd DpQOefLwMzgq0UknBwcD/Rpz7m7NNe01AQNCMkh1i0VugS/FLFrpnvfEBg1ikqwSAsjy+u CxFSkM3vEc31b2r/WDy69ejWuXQfdpIZeu0K/opUDgA1UyQBmLaaTTT5Iej0sRDdC2K93h gSRfo6uHwd4t0eE32w6sZHflp7ZF1YHg4YTyLrwQje4aFIvQolp8jtTybVMVYE0Upm7K3R rMVlx6sx7FEu0t8aZ5Z1yllhqRg5dXncHVRgKANX2d7EaahI8HzLdIyMris5xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701304688; a=rsa-sha256; cv=none; b=ENQKfUnF8E/wJfHrnhTZQ9EHmUYiFusmbOHEPuNZWWPAyEP4PjtsgC4zDm7TzamU+7ua8k zvRROGIJlboWHyu3gXNcdPOPi5IeKHJ75uQ5IuexpDIk6POVprFM5O5DosPlB4RNwAnZRy SrI0pRwpc+Kg5ahVsOd/Vk9lbx5ck19jnrIsS0ooPAAGKQckaUo4eR7Q9nQdAEmeVcncN1 2iT/AjiZkOj3RNnMT6oQBo+Wja3D9nlvp8nlOW/pJqH0cn2NOyywsOJ928Hg2sVJFyT2Ax gF2a3ouMct3XFTw5gfVpzdPZnB2GQMajPrHfuahitwfaaeSZzYsB9XOxuTFhXg== 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 4Sgcjr0MqWzDMQ; Thu, 30 Nov 2023 00:38:08 +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 3AU0c7xM051602; Thu, 30 Nov 2023 00:38:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AU0c7rE051599; Thu, 30 Nov 2023 00:38:07 GMT (envelope-from git) Date: Thu, 30 Nov 2023 00:38:07 GMT Message-Id: <202311300038.3AU0c7rE051599@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: e0910cf2d695 - stable/14 - dpaa2: make software VLANs usable on dpni 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: e0910cf2d6958e8e4593dd7488eb2c98c603859b Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e0910cf2d6958e8e4593dd7488eb2c98c603859b commit e0910cf2d6958e8e4593dd7488eb2c98c603859b Author: Bjoern A. Zeeb AuthorDate: 2023-11-15 11:46:44 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-30 00:36:56 +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 GH-Issue: https://github.com/mcusim/freebsd-src/issues/22 Reviewed by: dsl Differential Revision: https://reviews.freebsd.org/D42645 (cherry picked from commit 0480dccd3f347da0dbccf5917633435d5ce6cb86) --- 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 c1543ec20881..a9e6aa120549 100644 --- a/sys/dev/dpaa2/dpaa2_ni.c +++ b/sys/dev/dpaa2/dpaa2_ni.c @@ -2582,7 +2582,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);