From owner-svn-src-stable@FreeBSD.ORG  Thu Sep 16 14:55:22 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7A4A3106564A;
	Thu, 16 Sep 2010 14:55:22 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 68B0F8FC26;
	Thu, 16 Sep 2010 14:55:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8GEtM8Y094607;
	Thu, 16 Sep 2010 14:55:22 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8GEtMxY094605;
	Thu, 16 Sep 2010 14:55:22 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201009161455.o8GEtMxY094605@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 16 Sep 2010 14:55:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212735 - stable/8/sys/net
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Sep 2010 14:55:22 -0000

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