From nobody Fri Aug 18 01:00:18 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 4RRk7R3br8z4qPpX; Fri, 18 Aug 2023 01:00:19 +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 4RRk7R18z2z3L7b; Fri, 18 Aug 2023 01:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692320419; 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=5CflBasuSv/jedMjuZpWZCVjUcnnIiKj0w5KRw1VUmM=; b=wN6/mxoaa8TtHsxbJOXtkafmGVPHD3NFegEUgJF9OxjyKPbE6O1t5OjC/JjNrEFbKXm0Ej F/A6PpM5vAqk3jQC5qnqVdexPwRQVOsG3nTagkH3bLTwaqUeio9hgpNlFowvn0dP+7iSHQ 4hjwCtd/ekPd7BZqBqsUKZs+DF9w2PIk3wIEkvhXHSUPbrTYhwz3tn/DBv4RuxmMzhY+8o o8x3WYIsa9tbJoUc0W2ES89mLVcSbPoJJR3jo1xHOQtGqSUyQWWF39vtzXdsGQYAMXBrf4 gWrIY+uE6TIk3mMqgoV6hLHLARdWnf+PQmiKZWubNilyQkegShLWdjBCFQXXRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692320419; 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=5CflBasuSv/jedMjuZpWZCVjUcnnIiKj0w5KRw1VUmM=; b=i+ezwrEcWqRxHfHxW2yWF+dY2elZ6RBeh//Rcbf9EoI+UFchZXNqMNWDV78162RRVFiCE5 eVEJn+DP9ZHtWQxTBAIhgZIHT6o2MRwXyU/e7WOPEldo6VuiLIk46f3tLQxxVrClNUj/x+ H0jL5T7NfHW4yAos+M6/gFj3tYGAncM7TNIrECkc9D6BdJJ2TCWkDPeuVABwujtxOMHYRA Leq5UIOiAf9+QvSolEAFoqg5zRPPcpKfo2QH6kB1Aj6TJIgxOpgsdxmUZ97o2Qq4s9Wugc zObxgYkdMRXa/gIoVaXqMmBLTFX6oTRq54uECSMRu03Kj2DcsDQsPDKeiYZlCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692320419; a=rsa-sha256; cv=none; b=rY7R2ci+cZvbCQiGBzehuEVRgCFCdw+Sy9NiFcTcUc6qfVh4LyMKY82qRnE8qQyzpjvZtq 4qiXh1f5Ej1LJgomP9Mhbw9zwNuNvY1i9LYezS6AYF6St7CrLHpZH+F7HxU9KiNVkE/Vln 90hZMwzwMYLvvP1689UaJ6+yaZTMXyUyFlCXO6bPGqOajmJFdAVavMHFfG13SfcKmOnRWq vQeA3/qSGvtSdpdKT0VrIdE8qzsmIRqNSY8Ut7OAgZzq2wLoZlGBzHashG5iodDByMH1/A oek1pQUvuyyT1KPmJBvc66gainaR8ABp1bffK3LqYefaU4Y7/lSIsmnwJj2QxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RRk7R05m8zwSN; Fri, 18 Aug 2023 01:00:19 +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 37I10Ieu090137; Fri, 18 Aug 2023 01:00:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I10IEh090134; Fri, 18 Aug 2023 01:00:18 GMT (envelope-from git) Date: Fri, 18 Aug 2023 01:00:18 GMT Message-Id: <202308180100.37I10IEh090134@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 50b52fe14b89 - stable/12 - vlan: Respect IFCAP_LRO mask 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 50b52fe14b8949539e7fe583d4578b1f2c96dc59 Auto-Submitted: auto-generated The branch stable/12 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=50b52fe14b8949539e7fe583d4578b1f2c96dc59 commit 50b52fe14b8949539e7fe583d4578b1f2c96dc59 Author: Kevin Bowling AuthorDate: 2023-08-12 16:31:22 +0000 Commit: Kevin Bowling CommitDate: 2023-08-18 01:00:07 +0000 vlan: Respect IFCAP_LRO mask vlan_capabilities(), used by the IFCAP ioctl, was not respecting the IFCAP_LRO bit if it was masked by the requestor. This prevented if_bridge(4) from automasking LRO with a message like: bridge0: can't disable some capabilities on em3.11: 0x400 This also prevented manually disabling LRO from any vlan interface. PR: 254596 Reported by: Paul Vixie (cherry picked from commit b1a39c31a3569bd045a0f40057c3773fc8166f6d) --- sys/net/if_vlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 491c1a4fa371..5c84480e15d3 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1748,7 +1748,7 @@ vlan_capabilities(struct ifvlan *ifv) if (p->if_capabilities & IFCAP_VLAN_HWCSUM) cap |= p->if_capabilities & IFCAP_LRO; if (p->if_capenable & IFCAP_VLAN_HWCSUM) - ena |= p->if_capenable & IFCAP_LRO; + ena |= mena & IFCAP_LRO; /* * If the parent interface can offload TCP connections over VLANs then