git: 25dbc30ef5c9 - main - if_vtnet: Remove at attach PROMISC handling

[Bryan Venteicher]

The branch main has been updated by bryanv:

URL: https://cgit.FreeBSD.org/src/commit/?id=25dbc30ef5c99d8251fd7c43075295ca01049c89

commit 25dbc30ef5c99d8251fd7c43075295ca01049c89
Author:     Bryan Venteicher <bryanv at FreeBSD.org>
AuthorDate: 2021-01-19 04:55:24 +0000
Commit:     Bryan Venteicher <bryanv at FreeBSD.org>
CommitDate: 2021-01-19 04:55:24 +0000

    if_vtnet: Remove at attach PROMISC handling
    
    This may have been required in an early, early, early version of the
    specification but I cannot find any reference to it, and a promiscuous
    default seems very odd so remove this code.
    
    Reviewed by: grehan (mentor)
    Differential Revision: https://reviews.freebsd.org/D27909
---
 sys/dev/virtio/network/if_vtnet.c | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c
index f20a798a16ed..4a26e403071d 100644
--- a/sys/dev/virtio/network/if_vtnet.c
+++ b/sys/dev/virtio/network/if_vtnet.c
@@ -201,7 +201,6 @@ static int	vtnet_ctrl_mq_cmd(struct vtnet_softc *, uint16_t);
 static int	vtnet_ctrl_rx_cmd(struct vtnet_softc *, uint8_t, int);
 static int	vtnet_set_promisc(struct vtnet_softc *, int);
 static int	vtnet_set_allmulti(struct vtnet_softc *, int);
-static void	vtnet_attach_disable_promisc(struct vtnet_softc *);
 static void	vtnet_rx_filter(struct vtnet_softc *);
 static void	vtnet_rx_filter_mac(struct vtnet_softc *);
 static int	vtnet_exec_vlan_filter(struct vtnet_softc *, int, uint16_t);
@@ -570,8 +569,6 @@ static int
 vtnet_attach_completed(device_t dev)
 {
 
-	vtnet_attach_disable_promisc(device_get_softc(dev));
-
 	return (0);
 }
 
@@ -3351,28 +3348,6 @@ vtnet_set_allmulti(struct vtnet_softc *sc, int on)
 	return (vtnet_ctrl_rx_cmd(sc, VIRTIO_NET_CTRL_RX_ALLMULTI, on));
 }
 
-/*
- * The device defaults to promiscuous mode for backwards compatibility.
- * Turn it off at attach time if possible.
- */
-static void
-vtnet_attach_disable_promisc(struct vtnet_softc *sc)
-{
-	struct ifnet *ifp;
-
-	ifp = sc->vtnet_ifp;
-
-	VTNET_CORE_LOCK(sc);
-	if ((sc->vtnet_flags & VTNET_FLAG_CTRL_RX) == 0) {
-		ifp->if_flags |= IFF_PROMISC;
-	} else if (vtnet_set_promisc(sc, 0) != 0) {
-		ifp->if_flags |= IFF_PROMISC;
-		device_printf(sc->vtnet_dev,
-		    "cannot disable default promiscuous mode\n");
-	}
-	VTNET_CORE_UNLOCK(sc);
-}
-
 static void
 vtnet_rx_filter(struct vtnet_softc *sc)
 {