From nobody Sat Aug 12 16:39:39 2023 X-Original-To: dev-commits-src-main@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 4RNRG34sgfz4qGhT; Sat, 12 Aug 2023 16:39:39 +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 4RNRG34DsLz3MGP; Sat, 12 Aug 2023 16:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691858379; 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=IjanUs7ymizYCIGrHV2g/Ilq33mYUnE377S0+SbmRTk=; b=oIQVZ9aPK+EGQXkqVWYRbd/VlSOkc/5Vmd0EIiLidoaCTbecYuXtO7oe++rSZpTX5ZCFnk rYfO8+UTKCYULLUgNHJTMiWu0nKlNIbtwHIZdbqTqtE0QkAXH1IdFzYJOS6bULS58duPRb W3BPNmrX98LYnQyfQyb+lBK3cppbqg8IfrBHESQn4E7UD11IIv3BxtensZ89kVH9C0t9j+ 7QRVV/XrnEZzBO9VsG1MZ1Xil8TqmxzjrwSYGSvc1GDFb0RdO8JJy5ufrqOqI1L7ir4E6S GHlHlKv/uHE3jXrz+uO464ndX9g1GZAjYlpbitDgkJBQD9toIHASBQ5hniFNKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691858379; 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=IjanUs7ymizYCIGrHV2g/Ilq33mYUnE377S0+SbmRTk=; b=T5jjjp2pzAe8zp7kO4XTjKc3TXRdDVmSXQfUTvmvGbt1B3MxzCZcdn8Ei8LEP6AjUi6Snf kw/n4GMZ6U+GK2hBinPJlqfP5s/xscKKyGiu9pezrsn++YRKrO7OBmsH2WP1t4BxllDsW2 CFxiqWJtnLPEzdPcfEir/pybV7LP5W+mcunhuwCGVQ0rIap6qiNLVqMym3HapOuiEGvKIC fzpIExgv37c81FgA4qBplLjpmmrfv/+GO0lWuZxF+OegbU7ig3uqzz5XCrRlSUXp5kb8us wnYQMhjjQp6J5gu1JyQ88OCwpRzJtUYHqB8PiMizpY5elGfRtkwZYKUt8+x4jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691858379; a=rsa-sha256; cv=none; b=SnIDZyMPNqOdvqLQMP241sOcV3kEfEkytIwr1gIYyJcJK9BTzQZmaDAXryt+rLBx4Euqi4 yVfWT60lxgjLC9ip0isNB/T6OTn0ktkWQvxrOUK17bUtY8Xlm5OXt/tQs/+V8QJee2AjAd MBzky65ykGZagyhlEUFwImZ7W3ajEtJ2jWynwPRUuuzQNtuPcZVKXgWm5eFbYEWY/8EUQC HqOd8GrReqO2Ri1Yw1MoiM8E4HyJcUGMsvRtBAomgShNxPuqcjgpQWLi9FLcVDjwCyvUWB DGoXhzwqMpfRaQFEzDh+rWugCTj1vw8Av4r01UAmxKraNy+gZeWzRQMfJmvvaA== 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 4RNRG33FmDzCrJ; Sat, 12 Aug 2023 16:39:39 +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 37CGdd2C039832; Sat, 12 Aug 2023 16:39:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37CGddWi039829; Sat, 12 Aug 2023 16:39:39 GMT (envelope-from git) Date: Sat, 12 Aug 2023 16:39:39 GMT Message-Id: <202308121639.37CGddWi039829@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: b1a39c31a356 - main - vlan: Respect IFCAP_LRO mask List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b1a39c31a3569bd045a0f40057c3773fc8166f6d Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=b1a39c31a3569bd045a0f40057c3773fc8166f6d commit b1a39c31a3569bd045a0f40057c3773fc8166f6d Author: Kevin Bowling AuthorDate: 2023-08-12 16:31:22 +0000 Commit: Kevin Bowling CommitDate: 2023-08-12 16:39:23 +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 MFC after: 1 week --- 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 6aa872a19364..51f0bc63ebda 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -2074,7 +2074,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