git: 0480dccd3f34 - main - dpaa2: make software VLANs usable on dpni

The branch main has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=0480dccd3f347da0dbccf5917633435d5ce6cb86

commit 0480dccd3f347da0dbccf5917633435d5ce6cb86
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2023-11-15 11:46:44 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
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);