From owner-svn-src-all@freebsd.org Fri Feb 12 20:55:23 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A607CAA7172; Fri, 12 Feb 2016 20:55:23 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 734E8A03; Fri, 12 Feb 2016 20:55:23 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1CKtMoQ032869; Fri, 12 Feb 2016 20:55:22 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1CKtM28032866; Fri, 12 Feb 2016 20:55:22 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201602122055.u1CKtM28032866@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 12 Feb 2016 20:55:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r295578 - head/sys/netinet6 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Feb 2016 20:55:23 -0000 Author: markj Date: Fri Feb 12 20:55:22 2016 New Revision: 295578 URL: https://svnweb.freebsd.org/changeset/base/295578 Log: Remove superfluous return statements from the neighbour discovery code. MFC after: 1 week Modified: head/sys/netinet6/nd6.c head/sys/netinet6/nd6_nbr.c head/sys/netinet6/nd6_rtr.c Modified: head/sys/netinet6/nd6.c ============================================================================== --- head/sys/netinet6/nd6.c Fri Feb 12 20:54:02 2016 (r295577) +++ head/sys/netinet6/nd6.c Fri Feb 12 20:55:22 2016 (r295578) @@ -2512,7 +2512,6 @@ clear_llinfo_pqueue(struct llentry *ln) } ln->la_hold = NULL; - return; } static int nd6_sysctl_drlist(SYSCTL_HANDLER_ARGS); Modified: head/sys/netinet6/nd6_nbr.c ============================================================================== --- head/sys/netinet6/nd6_nbr.c Fri Feb 12 20:54:02 2016 (r295577) +++ head/sys/netinet6/nd6_nbr.c Fri Feb 12 20:55:22 2016 (r295578) @@ -584,7 +584,6 @@ nd6_ns_output_fib(struct ifnet *ifp, con bad: m_freem(m); - return; } #ifndef BURN_BRIDGES @@ -1078,7 +1077,6 @@ nd6_na_output_fib(struct ifnet *ifp, con bad: m_freem(m); - return; } #ifndef BURN_BRIDGES Modified: head/sys/netinet6/nd6_rtr.c ============================================================================== --- head/sys/netinet6/nd6_rtr.c Fri Feb 12 20:54:02 2016 (r295577) +++ head/sys/netinet6/nd6_rtr.c Fri Feb 12 20:55:22 2016 (r295578) @@ -503,7 +503,6 @@ defrouter_addreq(struct nd_defrouter *ne } if (error == 0) new->installed = 1; - return; } struct nd_defrouter * @@ -702,8 +701,6 @@ defrouter_select(void) defrouter_delreq(installed_dr); defrouter_addreq(selected_dr); } - - return; } /*