Author: qingli
Date: Thu Oct 13 09:21:49 2011
New Revision: 226337
URL: http://svn.freebsd.org/changeset/base/226337
Log:
MFC 226120
PR: kern/159602
Submitted by: pluknet
Approved by: re (kib)
Modified:
stable/9/sys/netinet/in.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
Modified: stable/9/sys/netinet/in.c
==============================================================================
--- stable/9/sys/netinet/in.c Thu Oct 13 08:36:11 2011 (r226336)
+++ stable/9/sys/netinet/in.c Thu Oct 13 09:21:49 2011 (r226337)
@@ -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);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
