Date: Thu, 29 Dec 2011 15:59:15 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r228959 - head/sys/netinet Message-ID: <201112291559.pBTFxFP5062565@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Thu Dec 29 15:59:14 2011 New Revision: 228959 URL: http://svn.freebsd.org/changeset/base/228959 Log: Don't fallback to a CARP address in BACKUP state. Modified: head/sys/netinet/if_ether.c Modified: head/sys/netinet/if_ether.c ============================================================================== --- head/sys/netinet/if_ether.c Thu Dec 29 15:35:47 2011 (r228958) +++ head/sys/netinet/if_ether.c Thu Dec 29 15:59:14 2011 (r228959) @@ -610,7 +610,9 @@ in_arpinput(struct mbuf *m) */ IF_ADDR_LOCK(ifp); TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) - if (ifa->ifa_addr->sa_family == AF_INET) { + if (ifa->ifa_addr->sa_family == AF_INET && + (ifa->ifa_carp == NULL || + (*carp_iamatch_p)(ifa, &enaddr))) { ia = ifatoia(ifa); ifa_ref(ifa); IF_ADDR_UNLOCK(ifp);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112291559.pBTFxFP5062565>