From af62becb69fced07907e16f75095de297a34eaba Mon Sep 17 00:00:00 2001 From: =?utf8?q?Imre=20Vad=C3=A1sz?= Date: Sun, 25 Mar 2018 21:05:04 +0200 Subject: [PATCH] if_vtnet - Remove vtnet_tick_ch and vtnet_cfgchg_task from softc struct. * Forgot to remove the softc variables in the changes c5f8e1538bcc13f7a39b805bcc5b774780 and 603be9646446bdb4292b6cd27544788c2c. * Also remove a leftover taskqueue_drain() call. --- sys/dev/virtual/virtio/net/if_vtnet.c | 2 -- sys/dev/virtual/virtio/net/if_vtnetvar.h | 4 ---- 2 files changed, 6 deletions(-) diff --git a/sys/dev/virtual/virtio/net/if_vtnet.c b/sys/dev/virtual/virtio/net/if_vtnet.c index e427401112..f4f5dd3c98 100644 --- a/sys/dev/virtual/virtio/net/if_vtnet.c +++ b/sys/dev/virtual/virtio/net/if_vtnet.c @@ -413,8 +413,6 @@ vtnet_detach(device_t dev) vtnet_stop(sc); lwkt_serialize_exit(&sc->vtnet_slz); - taskqueue_drain(taskqueue_swi, &sc->vtnet_cfgchg_task); - ether_ifdetach(ifp); } diff --git a/sys/dev/virtual/virtio/net/if_vtnetvar.h b/sys/dev/virtual/virtio/net/if_vtnetvar.h index 63ce0e093d..d1746a1e91 100644 --- a/sys/dev/virtual/virtio/net/if_vtnetvar.h +++ b/sys/dev/virtual/virtio/net/if_vtnetvar.h @@ -92,12 +92,8 @@ struct vtnet_softc { int vtnet_watchdog_timer; uint64_t vtnet_features; - struct task vtnet_cfgchg_task; - struct vtnet_statistics vtnet_stats; - struct callout vtnet_tick_ch; - eventhandler_tag vtnet_vlan_attach; eventhandler_tag vtnet_vlan_detach; -- 2.11.4.GIT