From 63fda197fc64154f4bf23d6d713edcd559ee9749 Mon Sep 17 00:00:00 2001 From: glebius Date: Wed, 20 Apr 2005 09:32:05 +0000 Subject: Remove anti-LOR bandaid, it is not needed now. Sponsored by: Rambler --- sys/netinet/ip_carp.c | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'sys/netinet/ip_carp.c') diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 0c57a3a..13ea820 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -150,7 +150,6 @@ struct carp_if { TAILQ_HEAD(, carp_softc) vhif_vrs; int vhif_nvrs; - struct callout cif_tmo; struct ifnet *vhif_ifp; struct mtx vhif_mtx; }; @@ -209,7 +208,6 @@ enum { CARP_COUNT_MASTER, CARP_COUNT_RUNNING }; static int carp_set_addr(struct carp_softc *, struct sockaddr_in *); static int carp_del_addr(struct carp_softc *, struct sockaddr_in *); -static void carp_carpdev_state1(void *); static void carp_carpdev_state_locked(struct carp_if *); static void carp_sc_state_locked(struct carp_softc *); #ifdef INET6 @@ -426,7 +424,6 @@ carp_clone_destroy(struct ifnet *ifp) CARP_LOCK(cif); TAILQ_REMOVE(&cif->vhif_vrs, sc, sc_list); if (!--cif->vhif_nvrs) { - callout_drain(&cif->cif_tmo); sc->sc_carpdev->if_carp = NULL; CARP_LOCK_DESTROY(cif); FREE(cif, M_CARP); @@ -1428,7 +1425,6 @@ carp_set_addr(struct carp_softc *sc, struct sockaddr_in *sin) CARP_LOCK(cif); cif->vhif_ifp = ifp; TAILQ_INIT(&cif->vhif_vrs); - callout_init(&cif->cif_tmo, NET_CALLOUT_MPSAFE); ifp->if_carp = cif; } else { @@ -1505,7 +1501,6 @@ carp_del_addr(struct carp_softc *sc, struct sockaddr_in *sin) imo->imo_multicast_ifp = NULL; TAILQ_REMOVE(&cif->vhif_vrs, sc, sc_list); if (!--cif->vhif_nvrs) { - callout_drain(&cif->cif_tmo); sc->sc_carpdev->if_carp = NULL; CARP_LOCK_DESTROY(cif); FREE(cif, M_IFADDR); @@ -1614,7 +1609,6 @@ carp_set_addr6(struct carp_softc *sc, struct sockaddr_in6 *sin6) CARP_LOCK(cif); cif->vhif_ifp = ifp; TAILQ_INIT(&cif->vhif_vrs); - callout_init(&cif->cif_tmo, NET_CALLOUT_MPSAFE); ifp->if_carp = cif; } else { @@ -1702,7 +1696,6 @@ carp_del_addr6(struct carp_softc *sc, struct sockaddr_in6 *sin6) im6o->im6o_multicast_ifp = NULL; TAILQ_REMOVE(&cif->vhif_vrs, sc, sc_list); if (!--cif->vhif_nvrs) { - callout_drain(&cif->cif_tmo); CARP_LOCK_DESTROY(cif); sc->sc_carpdev->if_carp = NULL; FREE(cif, M_IFADDR); @@ -2056,20 +2049,6 @@ carp_carpdev_state(void *v) { struct carp_if *cif = v; - /* - * We came here from interrupt handler of network - * card. To avoid multiple LORs, we will queue function - * for later. - */ - - callout_reset(&cif->cif_tmo, 1, carp_carpdev_state1, v); -} - -void -carp_carpdev_state1(void *v) -{ - struct carp_if *cif = v; - CARP_LOCK(cif); carp_carpdev_state_locked(cif); CARP_UNLOCK(cif); -- cgit v1.1