Module Name: src
Committed By: maxv
Date: Tue May 1 06:50:06 UTC 2018
Modified Files:
src/sys/net: if.h net_osdep.h
Log Message:
Move if_name() from net_osdep.h to if.h. net_osdep.h is now unused and can
be removed - the other BSDs did the same.
Discussed with Kengo (if.h suggested by him).
To generate a diff of this commit:
cvs rdiff -u -r1.260 -r1.261 src/sys/net/if.h
cvs rdiff -u -r1.19 -r1.20 src/sys/net/net_osdep.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.h
diff -u src/sys/net/if.h:1.260 src/sys/net/if.h:1.261
--- src/sys/net/if.h:1.260 Thu Apr 19 21:20:43 2018
+++ src/sys/net/if.h Tue May 1 06:50:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.260 2018/04/19 21:20:43 christos Exp $ */
+/* $NetBSD: if.h,v 1.261 2018/05/01 06:50:06 maxv Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -405,6 +405,7 @@ typedef struct ifnet {
#define if_iqdrops if_data.ifi_iqdrops
#define if_noproto if_data.ifi_noproto
#define if_lastchange if_data.ifi_lastchange
+#define if_name(ifp) ((ifp)->if_xname)
#define IFF_UP 0x0001 /* interface is up */
#define IFF_BROADCAST 0x0002 /* broadcast address valid */
Index: src/sys/net/net_osdep.h
diff -u src/sys/net/net_osdep.h:1.19 src/sys/net/net_osdep.h:1.20
--- src/sys/net/net_osdep.h:1.19 Thu Feb 8 21:02:05 2018
+++ src/sys/net/net_osdep.h Tue May 1 06:50:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: net_osdep.h,v 1.19 2018/02/08 21:02:05 maxv Exp $ */
+/* $NetBSD: net_osdep.h,v 1.20 2018/05/01 06:50:06 maxv Exp $ */
/* $KAME: net_osdep.h,v 1.51 2001/07/06 06:21:43 itojun Exp $ */
/*
@@ -301,7 +301,5 @@
#define _NET_NET_OSDEP_H_
#ifdef _KERNEL
-#define if_name(ifp) ((ifp)->if_xname)
-
#endif /*_KERNEL*/
#endif /* !_NET_NET_OSDEP_H_ */
