Since net/net_osdep.c contained only one function that could be

trivially implemented as a macro, do that and remove it.  NetBSD did
this quite a while ago.

3 files changed, 1 insertions, 60 deletions

diff --git a/sys/conf/files b/sys/conf/files
index 2e4ceec..67b2ec8 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1252,7 +1252,6 @@ net/if_stf.c		optional stf
 net/if_tun.c		optional tun
 net/if_tap.c		optional tap
 net/if_vlan.c		optional vlan
-net/net_osdep.c		standard
 net/netisr.c		standard
 net/ppp_deflate.c	optional ppp_deflate
 net/ppp_tty.c		optional ppp
diff --git a/sys/net/net_osdep.c b/sys/net/net_osdep.c
deleted file mode 100644
index 90601e2..0000000
--- a/sys/net/net_osdep.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$FreeBSD$	*/
-/*	$KAME: net_osdep.c,v 1.12 2002/12/02 14:28:57 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/mbuf.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/errno.h>
-#include <sys/time.h>
-#include <sys/syslog.h>
-#include <machine/cpu.h>
-
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/netisr.h>
-#include <net/route.h>
-#include <net/bpf.h>
-
-#include <net/net_osdep.h>
-
-const char *
-if_name(ifp)
-	struct ifnet *ifp;
-{
-	return ifp->if_xname;
-}
diff --git a/sys/net/net_osdep.h b/sys/net/net_osdep.h
index 2cafa02..66e99b5 100644
--- a/sys/net/net_osdep.h
+++ b/sys/net/net_osdep.h
@@ -319,8 +319,7 @@
 #define __NET_NET_OSDEP_H_DEFINED_
 #ifdef _KERNEL
 
-struct ifnet;
-extern const char *if_name(struct ifnet *);
+#define if_name(ifp)	((ifp)->if_xname)
 
 #define HAVE_OLD_BPF
 #define HAVE_NEW_BPFATTACH