Module Name: src
Committed By: ozaki-r
Date: Mon Dec 1 07:15:42 UTC 2014
Modified Files:
src/sys/net: if.c if.h
Log Message:
Make more functions static
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.301 -r1.302 src/sys/net/if.c
cvs rdiff -u -r1.181 -r1.182 src/sys/net/if.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.301 src/sys/net/if.c:1.302
--- src/sys/net/if.c:1.301 Mon Dec 1 00:27:05 2014
+++ src/sys/net/if.c Mon Dec 1 07:15:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.301 2014/12/01 00:27:05 christos Exp $ */
+/* $NetBSD: if.c,v 1.302 2014/12/01 07:15:42 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.301 2014/12/01 00:27:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.302 2014/12/01 07:15:42 ozaki-r Exp $");
#include "opt_inet.h"
@@ -194,6 +194,10 @@ static void sysctl_sndq_setup(struct sys
struct ifaltq *);
static void if_slowtimo(void *);
static void if_free_sadl(struct ifnet *);
+static void if_attachdomain1(struct ifnet *);
+static int ifconf(u_long, void *);
+static int if_clone_create(const char *);
+static int if_clone_destroy(const char *);
#if defined(INET) || defined(INET6)
static void sysctl_net_pktq_setup(struct sysctllog **, int);
@@ -655,7 +659,7 @@ if_attachdomain(void)
splx(s);
}
-void
+static void
if_attachdomain1(struct ifnet *ifp)
{
struct domain *dp;
@@ -968,7 +972,7 @@ if_rt_walktree(struct rtentry *rt, void
/*
* Create a clone network interface.
*/
-int
+static int
if_clone_create(const char *name)
{
struct if_clone *ifc;
@@ -987,7 +991,7 @@ if_clone_create(const char *name)
/*
* Destroy a clone network interface.
*/
-int
+static int
if_clone_destroy(const char *name)
{
struct if_clone *ifc;
@@ -2109,7 +2113,7 @@ ifioctl_detach(struct ifnet *ifp)
* would have been written had there been adequate space.
*/
/*ARGSUSED*/
-int
+static int
ifconf(u_long cmd, void *data)
{
struct ifconf *ifc = (struct ifconf *)data;
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.181 src/sys/net/if.h:1.182
--- src/sys/net/if.h:1.181 Fri Nov 28 08:29:00 2014
+++ src/sys/net/if.h Mon Dec 1 07:15:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.181 2014/11/28 08:29:00 ozaki-r Exp $ */
+/* $NetBSD: if.h,v 1.182 2014/12/01 07:15:42 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -866,14 +866,12 @@ void if_set_sadl(struct ifnet *, const v
void if_alloc_sadl(struct ifnet *);
void if_attach(struct ifnet *);
void if_attachdomain(void);
-void if_attachdomain1(struct ifnet *);
void if_deactivate(struct ifnet *);
void if_purgeaddrs(struct ifnet *, int, void (*)(struct ifaddr *));
void if_detach(struct ifnet *);
void if_down(struct ifnet *);
void if_link_state_change(struct ifnet *, int);
void if_up(struct ifnet *);
-int ifconf(u_long, void *);
void ifinit(void);
void ifinit1(void);
int ifaddrpref_ioctl(struct socket *, u_long, void *, struct ifnet *);
@@ -905,9 +903,6 @@ void link_rtrequest(int, struct rtentry
void if_clone_attach(struct if_clone *);
void if_clone_detach(struct if_clone *);
-int if_clone_create(const char *);
-int if_clone_destroy(const char *);
-
int ifq_enqueue(struct ifnet *, struct mbuf * ALTQ_COMMA
ALTQ_DECL(struct altq_pktattr *));
int ifq_enqueue2(struct ifnet *, struct ifqueue *, struct mbuf * ALTQ_COMMA
