svn commit: r228959 - head/sys/netinet

[Gleb Smirnoff]

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);