From nobody Sat Feb 05 15:53:42 2022 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 80E2E19AFBCE; Sat, 5 Feb 2022 15:53:42 +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 4JrcQG36j6z4s9s; Sat, 5 Feb 2022 15:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644076422; 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=PzY2E5kRh4kNr7DTE0MnefHF6lQmvEvoqcDdiKyTTPM=; b=po4LQSGRNLUkE3JXXOvyz7Kp1tbw4h8r0CIbbAybcAV8MprqiPA6cX8EKdFu47EbbdpqAH G+8GkHaFYJ9uII1QlbIxNZlbQ8fhb1NSSn/bLUxhYfVFoms/DpUNYiSSxhZZr4fTKbLmaU e4wCvqAVW7Y8EW9gtZt72wwLVFyFvlqTneP6R5VEFN/fSo1PvcxQamZZUXc4aEh2vPy/39 UUjL/hP3Ln9j5huB5kRrmN7gjlrMWXppDFZGFq/09iL50HCY7jBWvUJx1pahz1txIdgHLq Q9SzI7AsnkXG8ZgiZ0oRg9buH6d49U/QHJe/Bp5HXUDRgem319KaTGEDhocrsQ== 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 4C2D121CFF; Sat, 5 Feb 2022 15:53:42 +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 215FrgDc097577; Sat, 5 Feb 2022 15:53:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 215FrgbV097576; Sat, 5 Feb 2022 15:53:42 GMT (envelope-from git) Date: Sat, 5 Feb 2022 15:53:42 GMT Message-Id: <202202051553.215FrgbV097576@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aleksandr Fedorov Subject: git: fc035df8af32 - main - if_vtnet(4): Restore the ability to set promisc mode. 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: afedorov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc035df8af32d496885e5da26e519ce6a262c9bf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644076422; 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=PzY2E5kRh4kNr7DTE0MnefHF6lQmvEvoqcDdiKyTTPM=; b=qkpJ1DCNGPN5AWGFYclD//DwrGYTM0zaV4lE5pjZQ/8vP6vFj8JeUdkTUNtBRW66E/Glwq OQHV/yxeJV8n2nfypCm9oyr+iL2NKYadosGARWL484uou0hIyWPUSABdb6UDJ1j/y4RU9L mHV6rFQSa86V2VxYIAGSLKzzwQwjuyyJ1mbp7bNA91CK9MU/hf9Is9Jiz/ZcTf4f2V3kSR PzTumQViretoYmA0hWMPmD7lHO9OBss1KU83tudhUsL+ysjPCDmmR2SBOfO0DBPrkTTF98 P3SmwPQ8sIetnMTbPGQbkdbnH3vOlAY9olc1fHYUYY+axLOD6ewnNmqpjEvyug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644076422; a=rsa-sha256; cv=none; b=SYho999q4HLzerAnbe05o9HcfOwz4YYrwYIUddcVOHFAMeP9NOzW0aECHzCxicT08LKcRu NHU7VwK3rWAvhUH6JnqM9kmi2nuxZ3s0C3pdEIgoD+U/2nZhcn4MqlRcaIue0rh/4utMPU +TB+6Zjc8pCgctaPRcENwx7Ylqjzvq7YFoOXV9+cfZUkq6Vs5sEx8sc7VZcu56XZZ9BtSp KZxRHBV3KVmrHY1RlQyqdw652L+BS2FCTIKVUfy917tJU3JRatNrb9vs2+yrFI4kbivljP hFxprfk4Kjom9k1HRGFDVtlIHkWdJEhD/LmUGIsSsSaDI5MRFpQQNlLku0D86w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by afedorov: URL: https://cgit.FreeBSD.org/src/commit/?id=fc035df8af32d496885e5da26e519ce6a262c9bf commit fc035df8af32d496885e5da26e519ce6a262c9bf Author: Aleksandr Fedorov AuthorDate: 2022-02-05 15:47:46 +0000 Commit: Aleksandr Fedorov CommitDate: 2022-02-05 15:47:46 +0000 if_vtnet(4): Restore the ability to set promisc mode. PR: 254343, 255054 Reviewed by: vmaffione (mentor), donner Approved by: vmaffione (mentor), donner MFC after: 2 weeks Sponsored by: vstack.com Differential Revision: https://reviews.freebsd.org/D30639 --- sys/dev/virtio/network/if_vtnet.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 7cbbe56e6c6b..0a020e6b6c91 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -1302,9 +1302,13 @@ vtnet_ioctl_ifflags(struct vtnet_softc *sc) if ((ifp->if_flags ^ sc->vtnet_if_flags) & (IFF_PROMISC | IFF_ALLMULTI)) { - if ((sc->vtnet_flags & VTNET_FLAG_CTRL_RX) == 0) - return (ENOTSUP); - vtnet_rx_filter(sc); + if (sc->vtnet_flags & VTNET_FLAG_CTRL_RX) + vtnet_rx_filter(sc); + else { + if ((ifp->if_flags ^ sc->vtnet_if_flags) & IFF_ALLMULTI) + return (ENOTSUP); + ifp->if_flags |= IFF_PROMISC; + } } out: