From owner-svn-src-head@FreeBSD.ORG  Tue Jul 27 10:05:28 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F2DA31065675;
	Tue, 27 Jul 2010 10:05:27 +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 E466C8FC23;
	Tue, 27 Jul 2010 10:05:27 +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 o6RA5RfX057696;
	Tue, 27 Jul 2010 10:05:27 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6RA5R3O057694;
	Tue, 27 Jul 2010 10:05:27 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201007271005.o6RA5R3O057694@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 27 Jul 2010 10:05:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210529 - head/sys/net
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jul 2010 10:05:28 -0000

Author: glebius
Date: Tue Jul 27 10:05:27 2010
New Revision: 210529
URL: http://svn.freebsd.org/changeset/base/210529

Log:
  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
  Silence from:	qingli, 5 days

Modified:
  head/sys/net/if_llatbl.c

Modified: head/sys/net/if_llatbl.c
==============================================================================
--- head/sys/net/if_llatbl.c	Tue Jul 27 09:22:41 2010	(r210528)
+++ head/sys/net/if_llatbl.c	Tue Jul 27 10:05:27 2010	(r210529)
@@ -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