From nobody Thu Jun 1 09:39:40 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 4QX1Lj0lHmz4YBc4; Thu, 1 Jun 2023 09:39:41 +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 4QX1Lj0DD5z3wdT; Thu, 1 Jun 2023 09:39:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685612381; 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=YmTZdN9nzqIr/yoKjvteq88DuOw7YtM0ppIRh8FKLLE=; b=NptoeUGEzPqJ9/O4KMg0eEomDs5ScsU4KXEunjDxH8uRr8vR4a5QXX0Nj54kylN/tuHZnE zYKiRNlQQcNCJIWesLfGqC8lQpYfXo/XUUbncoTMt6zFVPBI1f+CuW+A+PwG08uUMLpUHy kHBfUwz0dxJ//MRtI6d/R7Zm6lyb+FBkVcH7220keoVKZXp6nLx2on/xPlCcKv6HoYQedC MNb91J+bvXvlKBTBhH07d+U39ofMOq5HL+lOyg/uwjzyqJZx3XpJcw5pwsLBWh3m8M7X33 vNY/qmXR0FEp1+fXE0MC6Ri9tB6GNDFGU/Dy4jmzM4hqpZ2fW9kid4kszLZ1yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685612381; 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=YmTZdN9nzqIr/yoKjvteq88DuOw7YtM0ppIRh8FKLLE=; b=Uwrpx6LT0HYWU3Ze8rnJClAe/UaUYTRWFr/Hk8UkDXdsHQvGM4AxZa8b7JX61xyAG/6EDx kL0IlUv5SCCEmaS59LN1RZC1hSLzw1POzt5GoHm9QbFeBP2Wvt6nBL939N41iRnM0Brrxv W9QXWXmUiAM4z4EvV6+TRxxAEwllhv1DjuhiNBiyA6Y2qMNsXsRhmHOWTz2flYecvD9avF 7xEC49GVcsChuj0btSCBQYXYeq6/3QH4ruUDiIcCxurwIMiwtwMyM3jQoYX52d56S+wsHs xFbVLdxFeKXaMUUTrtHJe+YxnIofGHzYLHUxRIAafVfsJdF8lCiC2w5uaOIcIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685612381; a=rsa-sha256; cv=none; b=RwIrrqX1A8XdHUCzMwaq/8us8HVOSiRykZCLaH+inD64gYxe0A2wa4HyU5+QYFXbbfwpxD n8igvz3Hb7TQJk8PUGjuNSQqJU3y/tx4Eu6e2mZupSHKPN0pna+TRY7t+WIBa8iLNoulwe 4gTcGqO6xMp34X84byDQU6hr9FcW3eTWhao4HjLIOVyCtbp15K1elEuIXF4bkhmuJ+CkvA VA0NblL87efxUxwb8465Vl8UKerZJeKOiJB+VHU+v16y+azr4pbSqoDRt9BYX20LBqbAhO uLfuL+OmSPAJrAYpAbwd19p3S+pgLKN7rg5mJIBZ+inMeToQeVAPjyQFqfgAnw== 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 4QX1Lh6PGbz1BtP; Thu, 1 Jun 2023 09:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3519deBM023179; Thu, 1 Jun 2023 09:39:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3519deE8023178; Thu, 1 Jun 2023 09:39:40 GMT (envelope-from git) Date: Thu, 1 Jun 2023 09:39:40 GMT Message-Id: <202306010939.3519deE8023178@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: fd7edfcdc3c3 - main - bridge: fix lookup for untagged packets in bridge_transmit() 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd7edfcdc3c329cdbd3f5e7a554f7153e805ab04 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fd7edfcdc3c329cdbd3f5e7a554f7153e805ab04 commit fd7edfcdc3c329cdbd3f5e7a554f7153e805ab04 Author: Ben Wilber AuthorDate: 2023-06-01 09:29:36 +0000 Commit: Kristof Provost CommitDate: 2023-06-01 09:31:59 +0000 bridge: fix lookup for untagged packets in bridge_transmit() b0e38a1373 improved if_bridge's ability to cope with different VLANs, but it failed to update bridge_transmit() to cope with the new rule that untagged packets are treated as having VLAN ID 0 (rather than 1, as used to be the case). Fix that oversight. PR: 270559 Reviewed by: kp --- sys/net/if_bridge.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 9fe915d31283..204fd3892c1f 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -2276,7 +2276,8 @@ bridge_transmit(struct ifnet *ifp, struct mbuf *m) eh = mtod(m, struct ether_header *); if (((m->m_flags & (M_BCAST|M_MCAST)) == 0) && - (dst_if = bridge_rtlookup(sc, eh->ether_dhost, 1)) != NULL) { + (dst_if = bridge_rtlookup(sc, eh->ether_dhost, DOT1Q_VID_NULL)) != + NULL) { error = bridge_enqueue(sc, dst_if, m); } else bridge_broadcast(sc, ifp, m, 0);