From owner-svn-src-all@FreeBSD.ORG  Thu Nov 24 22:46:12 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 47289106564A;
	Thu, 24 Nov 2011 22:46:12 +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 373CD8FC0C;
	Thu, 24 Nov 2011 22:46:12 +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 pAOMkCwg016011;
	Thu, 24 Nov 2011 22:46:12 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAOMkC0B016009;
	Thu, 24 Nov 2011 22:46:12 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201111242246.pAOMkC0B016009@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 24 Nov 2011 22:46:12 +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: r227959 - head/sys/netinet
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Nov 2011 22:46:12 -0000

Author: glebius
Date: Thu Nov 24 22:46:11 2011
New Revision: 227959
URL: http://svn.freebsd.org/changeset/base/227959

Log:
  Remove superfluous check: SIOCAIFADDR must have ifra_addr supplied.

Modified:
  head/sys/netinet/in.c

Modified: head/sys/netinet/in.c
==============================================================================
--- head/sys/netinet/in.c	Thu Nov 24 22:43:48 2011	(r227958)
+++ head/sys/netinet/in.c	Thu Nov 24 22:46:11 2011	(r227959)
@@ -541,10 +541,7 @@ in_control(struct socket *so, u_long cmd
 		maskIsNew = 0;
 		hostIsNew = 1;
 		error = 0;
-		if (ifra->ifra_addr.sin_len == 0) {
-			ifra->ifra_addr = ia->ia_addr;
-			hostIsNew = 0;
-		} else if (ifra->ifra_addr.sin_addr.s_addr ==
+		if (ifra->ifra_addr.sin_addr.s_addr ==
 			    ia->ia_addr.sin_addr.s_addr)
 			hostIsNew = 0;
 		if (ifra->ifra_mask.sin_len) {