Attachment #146357 for bug #147950

View | Details | Raw Unified | Return to bug 147950
Collapse All | Expand All




# $FreeBSD: releng/9.3/sys/modules/if_carp/Makefile 221267 2011-04-30 17:59:54Z bz $

.PATH: ${.CURDIR}/../../netinet
.PATH: ${.CURDIR}/../../crypto

.include <bsd.own.mk>

KMOD=	if_carp
SRCS=	ip_carp.c sha1.c
SRCS+=	opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h vnode_if.h

.if !defined(KERNBUILDDIR)

Lines 900-907 carp_send_ad_all(void) Link Here

(-)/usr/src/sys/netinet/ip_carp.c (-1 / +8 lines)
900	CARP_SCLOCK(sc);	900	CARP_SCLOCK(sc);
901	if ((SC2IFP(sc)->if_flags & IFF_UP) &&	901	if ((SC2IFP(sc)->if_flags & IFF_UP) &&
902	(SC2IFP(sc)->if_drv_flags & IFF_DRV_RUNNING) &&	902	(SC2IFP(sc)->if_drv_flags & IFF_DRV_RUNNING) &&
903	sc->sc_state == MASTER)	903	sc->sc_state == MASTER) {
		904	CURVNET_SET(sc->sc_carpdev->if_vnet);
904	carp_send_ad_locked(sc);	905	carp_send_ad_locked(sc);
		906	CURVNET_RESTORE();
		907	}
905	CARP_SCUNLOCK(sc);	908	CARP_SCUNLOCK(sc);
906	}	909	}
907	mtx_unlock(&carp_mtx);	910	mtx_unlock(&carp_mtx);
Lines 913-919 carp_send_ad(void *v) Link Here
913	struct carp_softc *sc = v;	916	struct carp_softc *sc = v;
914		917
915	CARP_SCLOCK(sc);	918	CARP_SCLOCK(sc);
		919	CURVNET_SET(sc->sc_carpdev->if_vnet);
916	carp_send_ad_locked(sc);	920	carp_send_ad_locked(sc);
		921	CURVNET_RESTORE();
917	CARP_SCUNLOCK(sc);	922	CARP_SCUNLOCK(sc);
918	}	923	}
919		924
Lines 1364-1370 carp_master_down(void *v) Link Here
1364	struct carp_softc *sc = v;	1369	struct carp_softc *sc = v;
1365		1370
1366	CARP_SCLOCK(sc);	1371	CARP_SCLOCK(sc);
		1372	CURVNET_SET(sc->sc_carpdev->if_vnet);
1367	carp_master_down_locked(sc);	1373	carp_master_down_locked(sc);
		1374	CURVNET_RESTORE();
1368	CARP_SCUNLOCK(sc);	1375	CARP_SCUNLOCK(sc);
1369	}	1376	}
1370		1377

Return to bug 147950

Lines 1-11 Link Here

(-)/usr/src/sys/modules/if_carp/Makefile (-1 / +2 lines)
1	# $FreeBSD: releng/9.3/sys/modules/if_carp/Makefile 221267 2011-04-30 17:59:54Z bz $	1	# $FreeBSD: releng/9.3/sys/modules/if_carp/Makefile 221267 2011-04-30 17:59:54Z bz $
2		2
3	.PATH: ${.CURDIR}/../../netinet	3	.PATH: ${.CURDIR}/../../netinet
		4	.PATH: ${.CURDIR}/../../crypto
4		5
5	.include <bsd.own.mk>	6	.include <bsd.own.mk>
6		7
7	KMOD= if_carp	8	KMOD= if_carp
8	SRCS= ip_carp.c	9	SRCS= ip_carp.c sha1.c
9	SRCS+= opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h vnode_if.h	10	SRCS+= opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h vnode_if.h
10		11
11	.if !defined(KERNBUILDDIR)	12	.if !defined(KERNBUILDDIR)