From owner-svn-src-stable@FreeBSD.ORG  Fri Jun 29 12:05:20 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2413F1065675;
	Fri, 29 Jun 2012 12:05:20 +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 0E73D8FC28;
	Fri, 29 Jun 2012 12:05:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5TC5JIj044474;
	Fri, 29 Jun 2012 12:05:19 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5TC5JIt044472;
	Fri, 29 Jun 2012 12:05:19 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201206291205.q5TC5JIt044472@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 29 Jun 2012 12:05:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237774 - stable/9/usr.sbin/arp
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: Fri, 29 Jun 2012 12:05:20 -0000

Author: glebius
Date: Fri Jun 29 12:05:19 2012
New Revision: 237774
URL: http://svn.freebsd.org/changeset/base/237774

Log:
  Merge r233773 from head:
    Historically arp(8) did a route lookup for the entry it is
    about to add, and failed if it exist and had invalid data
    link type.
  
    Later on, in r201282, this check morphed to other code, but
    message "proxy entry exists for non 802 device" still left,
    and now it is printed in a case if route prefix found is
    equal to current address being added. In other words, when
    we are trying to add ARP entry for a network address. The
    message is absolutely unrelated and disappointing in this
    case.
  
    I don't see anything bad with setting ARP entries for
    network addresses. While useless in usual network,
    in a /31 RFC3021 it may be necessary. This, remove this code.

Modified:
  stable/9/usr.sbin/arp/arp.c
Directory Properties:
  stable/9/usr.sbin/arp/   (props changed)

Modified: stable/9/usr.sbin/arp/arp.c
==============================================================================
--- stable/9/usr.sbin/arp/arp.c	Fri Jun 29 10:39:42 2012	(r237773)
+++ stable/9/usr.sbin/arp/arp.c	Fri Jun 29 12:05:19 2012	(r237774)
@@ -387,10 +387,6 @@ set(int argc, char **argv)
 	}
 	addr = (struct sockaddr_inarp *)(rtm + 1);
 	sdl = (struct sockaddr_dl *)(SA_SIZE(addr) + (char *)addr);
-	if (addr->sin_addr.s_addr == dst->sin_addr.s_addr) {
-		printf("set: proxy entry exists for non 802 device\n");
-		return (1);
-	}
 
 	if ((sdl->sdl_family != AF_LINK) ||
 	    (rtm->rtm_flags & RTF_GATEWAY) ||