From owner-cvs-all@FreeBSD.ORG Thu Aug 10 10:10:13 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B303816A4DA; Thu, 10 Aug 2006 10:10:13 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 779D143D46; Thu, 10 Aug 2006 10:10:13 +0000 (GMT) (envelope-from glebius@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7AAAD07092530; Thu, 10 Aug 2006 10:10:13 GMT (envelope-from glebius@repoman.freebsd.org) Received: (from glebius@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7AAADt8092529; Thu, 10 Aug 2006 10:10:13 GMT (envelope-from glebius) Message-Id: <200608101010.k7AAADt8092529@repoman.freebsd.org> From: Gleb Smirnoff Date: Thu, 10 Aug 2006 10:10:13 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/sys/netinet ip_carp.c ip_carp.h X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Aug 2006 10:10:13 -0000 glebius 2006-08-10 10:10:13 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/netinet ip_carp.c ip_carp.h Log: MFC (rev. 1.39 of ip_carp.c, rev. 1.2 of ip_carp.h): o Introduce carp_multicast_cleanup(), which removes and frees multicast addresses from carp interface. [1] o Rewrite carpdetach(), so that it does the following things: [1] - Stops callouts. - Decrements carp_suppress_preempt, if needed. - Downs interface and sets CARP state to INIT. - Calls carp_multicast_cleanup(). - Detaches softc from carp_if and if we are the last frees the carp_if. o Use new carpdetach() in carp_clone_destroy(). o In carp_ifdetach() acquire the carp_if lock and cleanup all interfaces hanging on carp_if. [1] o Make carp_ifdetach() static and use EVENT(9) to call it from if_detach(). [2] o In carp_setrun() exit if the softc doesn't have a valid pointer to parent. [1] Obtained from: OpenBSD [1] Submitted by: Dan Lukes [2] PR: kern/82908 [2] Revision Changes Path 1.27.2.7 +101 -84 src/sys/netinet/ip_carp.c 1.1.4.1 +0 -1 src/sys/netinet/ip_carp.h