svn commit: r230271 - stable/8/sys/netinet

[Gleb Smirnoff]

Author: glebius
Date: Tue Jan 17 18:05:13 2012
New Revision: 230271
URL: http://svn.freebsd.org/changeset/base/230271

Log:
  MFhead r226367:
  
    Never switch directly from INIT to MASTER, since this produces
    nasty status flaps.
  
    PR:		kern/161123
    Submitted by:	Damien Fleuriot <dam my.gd>
    OpenBSD:	ip_carp.c, rev. 1.115

Modified:
  stable/8/sys/netinet/ip_carp.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/netinet/ip_carp.c
==============================================================================
--- stable/8/sys/netinet/ip_carp.c	Tue Jan 17 17:07:13 2012	(r230270)
+++ stable/8/sys/netinet/ip_carp.c	Tue Jan 17 18:05:13 2012	(r230271)
@@ -1391,22 +1391,10 @@ carp_setrun(struct carp_softc *sc, sa_fa
 
 	switch (sc->sc_state) {
 	case INIT:
-		if (carp_opts[CARPCTL_PREEMPT] && !carp_suppress_preempt) {
-			carp_send_ad_locked(sc);
-			carp_send_arp(sc);
-#ifdef INET6
-			carp_send_na(sc);
-#endif /* INET6 */
-			CARP_LOG("%s: INIT -> MASTER (preempting)\n",
-			    SC2IFP(sc)->if_xname);
-			carp_set_state(sc, MASTER);
-			carp_setroute(sc, RTM_ADD);
-		} else {
-			CARP_LOG("%s: INIT -> BACKUP\n", SC2IFP(sc)->if_xname);
-			carp_set_state(sc, BACKUP);
-			carp_setroute(sc, RTM_DELETE);
-			carp_setrun(sc, 0);
-		}
+		CARP_LOG("%s: INIT -> BACKUP\n", SC2IFP(sc)->if_xname);
+		carp_set_state(sc, BACKUP);
+		carp_setroute(sc, RTM_DELETE);
+		carp_setrun(sc, 0);
 		break;
 	case BACKUP:
 		callout_stop(&sc->sc_ad_tmo);