svn commit: r295578 - head/sys/netinet6

Mark Johnston markj at FreeBSD.org
Fri Feb 12 20:55:23 UTC 2016


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;
 }
 
 /*


More information about the svn-src-all mailing list