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

[Qing Li]

Author: qingli
Date: Mon Oct 10 21:43:53 2011
New Revision: 226238
URL: http://svn.freebsd.org/changeset/base/226238

Log:
  MFC 226120
  
  Do not try removing an ARP entry associated with a given interface
  address if that interface does not support ARP. Otherwise the
  system will generate error messages unnecessarily due to the missing
  entry.
  
  PR:		kern/159602
  Submitted by:	pluknet

Modified:
  stable/8/sys/netinet/in.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/netinet/in.c
==============================================================================
--- stable/8/sys/netinet/in.c	Mon Oct 10 21:41:34 2011	(r226237)
+++ stable/8/sys/netinet/in.c	Mon Oct 10 21:43:53 2011	(r226238)
@@ -1138,7 +1138,8 @@ in_scrubprefix(struct in_ifaddr *target,
 			if (error == 0)
 				target->ia_flags &= ~IFA_RTSELF;
 		}
-		if (flags & LLE_STATIC)
+		if ((flags & LLE_STATIC) &&
+			!(target->ia_ifp->if_flags & IFF_NOARP))
 			/* remove arp cache */
 			arp_ifscrub(target->ia_ifp, IA_SIN(target)->sin_addr.s_addr);
 	}