D27909.id82536.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D27909.id82536.diff
View Options

	diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c
	--- a/sys/dev/virtio/network/if_vtnet.c
	+++ b/sys/dev/virtio/network/if_vtnet.c
	@@ -201,7 +201,6 @@
	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 @@
	vtnet_attach_completed(device_t dev)
	{

	- vtnet_attach_disable_promisc(device_get_softc(dev));
	-
	return (0);
	}

	@@ -3351,28 +3348,6 @@
	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)
	{