From nobody Fri Aug 18 00:59:42 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 4RRk6l1Kh8z4qPsj; Fri, 18 Aug 2023 00:59:43 +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 4RRk6k6CmFz3KZm; Fri, 18 Aug 2023 00:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692320382; 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=3NumkOSnyM14tqEMz6hRwJrN0QIMkq+rNXoisDiunHk=; b=yHXQu3oBNyVEvrKdgEVTN2BmFNgkt7sEkEaVOhHxMmFESqRPE6uNGHTigNRhHDZcATgpVj IKXoddvDbqq/E7JQkZ8Fd6oyEUupPbw0b+lusFWG0dwbMJSozP8+/qlyrhwKHEws876dYE 3vMJUDKgyiG9Yuej9EDjf/KY7mymD06qcCmX2x0CmHzYR3rsC1MAYfA2r47W1ddMN9RNaB jewuKqUmF+LvWSxIZQgnGMkonu9pW8wNzubVBnWyJsDJWAWyrPOljW+nlm8mIxz1GM9kXn hrkAiRbRHOpYCyUFbG7e6Hu+lBubXcVugYO8ZiKUfmuEfWMJe6htz5bohaj2rQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692320382; 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=3NumkOSnyM14tqEMz6hRwJrN0QIMkq+rNXoisDiunHk=; b=CZri242y1KwIfLPI7fxfulMXpGhfpXWWT9Qqn2jr0XQ77QZgZ6eeCiFYygnglRoUhYBEnS 5zOYWtmTuf8GrtcGRhxQKFz+eTMlnHyBS3s3kuruc3jfF9Do6t26xNBmBFB/zvR6RHcDLW kIpsqbFFCshhdto/jb40UoA1aHCpXhxqBx3wj4fNWNUx8R6B2UkshhlM+49V/wRF2I64A6 0di/KyAo+SAGLVESrXhq/hwPyBovw9yngECnPpddLe4qzqN5tcA0vWFkE/ynnzyeRT3qfB lpwX2sGZodwpTWYGHwlg0DYu7/PBF/XGRucFOqmrdDkiV67b+Tja2priz8I19w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692320382; a=rsa-sha256; cv=none; b=FZqOzFn/Sj1Sf2XGL2ICi8W3RxUfth/6NZbsbMXAxmvPba0bvpWd5aR40MCja4TmaByKSy Qph74oQvZVQYG0+r4+VpjEMJJJehdG2oF8sdgB8GwIdG0XyG4bUtZ3tFoJ7Nzj/NG7ojzn kSYquGaR3RMHjj/VhWPoe0VMD/FlX902oeFMbZi1XGF38dqK6wy+BEwflOREKHndqtpVCv RVMC2oUvROV/z0BQjI57XBKCfEdSvvF6zumhH34lnauu1e9GBbPImg62HI2JbHjWN+tJXr eBdZ7YzzJvMpH9ZH2OyNatUyONglGOQQ+sOnTJtJHeVzxs51YSKlyKP6DXfXhA== 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 4RRk6k5HGrzvxS; Fri, 18 Aug 2023 00:59:42 +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 37I0xgEP080385; Fri, 18 Aug 2023 00:59:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I0xgjR080382; Fri, 18 Aug 2023 00:59:42 GMT (envelope-from git) Date: Fri, 18 Aug 2023 00:59:42 GMT Message-Id: <202308180059.37I0xgjR080382@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: f73eb35106cc - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: f73eb35106cc65d19af0f2e82a111308c5090c3a Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=f73eb35106cc65d19af0f2e82a111308c5090c3a commit f73eb35106cc65d19af0f2e82a111308c5090c3a Author: Kevin Bowling AuthorDate: 2023-08-12 16:31:22 +0000 Commit: Kevin Bowling CommitDate: 2023-08-18 00:59:30 +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 21082f2d5741..d34575dd61fc 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1850,7 +1850,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