Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 1 Nov 2013 10:29:11 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r257500 - head/sys/netinet
Message-ID:  <201311011029.rA1ATBkY033466@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: glebius
Date: Fri Nov  1 10:29:10 2013
New Revision: 257500
URL: http://svnweb.freebsd.org/changeset/base/257500

Log:
  in_ifadown() can be void.

Modified:
  head/sys/netinet/in_rmx.c
  head/sys/netinet/in_var.h

Modified: head/sys/netinet/in_rmx.c
==============================================================================
--- head/sys/netinet/in_rmx.c	Fri Nov  1 10:18:41 2013	(r257499)
+++ head/sys/netinet/in_rmx.c	Fri Nov  1 10:29:10 2013	(r257500)
@@ -433,15 +433,15 @@ in_ifadownkill(struct radix_node *rn, vo
 	return 0;
 }
 
-int
+void
 in_ifadown(struct ifaddr *ifa, int delete)
 {
 	struct in_ifadown_arg arg;
 	struct radix_node_head *rnh;
 	int	fibnum;
 
-	if (ifa->ifa_addr->sa_family != AF_INET)
-		return 1;
+	KASSERT(ifa->ifa_addr->sa_family == AF_INET,
+	    ("%s: wrong family", __func__));
 
 	for ( fibnum = 0; fibnum < rt_numfibs; fibnum++) {
 		rnh = rt_tables_get_rnh(fibnum, AF_INET);
@@ -452,7 +452,6 @@ in_ifadown(struct ifaddr *ifa, int delet
 		RADIX_NODE_HEAD_UNLOCK(rnh);
 		ifa->ifa_flags &= ~IFA_ROUTE;		/* XXXlocking? */
 	}
-	return 0;
 }
 
 /*

Modified: head/sys/netinet/in_var.h
==============================================================================
--- head/sys/netinet/in_var.h	Fri Nov  1 10:18:41 2013	(r257499)
+++ head/sys/netinet/in_var.h	Fri Nov  1 10:29:10 2013	(r257500)
@@ -411,7 +411,7 @@ void	in_rtqdrain(void);
 int	in_addprefix(struct in_ifaddr *, int);
 int	in_scrubprefix(struct in_ifaddr *, u_int);
 void	ip_input(struct mbuf *);
-int	in_ifadown(struct ifaddr *ifa, int);
+void	in_ifadown(struct ifaddr *ifa, int);
 struct	mbuf	*ip_fastforward(struct mbuf *);
 void	*in_domifattach(struct ifnet *);
 void	in_domifdetach(struct ifnet *, void *);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311011029.rA1ATBkY033466>