svn commit: r212735 - stable/8/sys/net

[Gleb Smirnoff]

Author: glebius
Date: Thu Sep 16 14:55:22 2010
New Revision: 212735
URL: http://svn.freebsd.org/changeset/base/212735

Log:
  MFhead 210529:
    When installing a new ARP entry via 'arp -S', lla_lookup() will
    either find an existing entry, or allocate a new one. In the latter
    case an entry would have flags, that were supplied as argument to
    lla_lookup(). In case of an existing entry, flags aren't modified.
  
    This lead to losing LLE_PUB and/or LLE_PROXY flags.
  
    We should apply these flags either in lla_rt_output() or in the
    in.c:in_lltable_lookup(). It seems to me that lla_rt_output() is
    a more correct choice.
  
    PR:           kern/148784, kern/146539

Modified:
  stable/8/sys/net/if_llatbl.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)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/net/if_llatbl.c
==============================================================================
--- stable/8/sys/net/if_llatbl.c	Thu Sep 16 14:30:32 2010	(r212734)
+++ stable/8/sys/net/if_llatbl.c	Thu Sep 16 14:55:22 2010	(r212735)
@@ -337,6 +337,7 @@ lla_rt_output(struct rt_msghdr *rtm, str
 			 * LLE_DELETED flag, and reset the expiration timer
 			 */
 			bcopy(LLADDR(dl), &lle->ll_addr, ifp->if_addrlen);
+			lle->la_flags |= (flags & (LLE_PUB | LLE_PROXY));
 			lle->la_flags |= LLE_VALID;
 			lle->la_flags &= ~LLE_DELETED;
 #ifdef INET6