diff options
49 files changed, 0 insertions, 80 deletions
diff --git a/contrib/ipfilter/ipsend/44arp.c b/contrib/ipfilter/ipsend/44arp.c index 9033ab9..9215959 100644 --- a/contrib/ipfilter/ipsend/44arp.c +++ b/contrib/ipfilter/ipsend/44arp.c @@ -8,9 +8,6 @@ #include <sys/socket.h> #include <sys/sysctl.h> #include <net/if.h> -#if __FreeBSD_version >= 300000 -# include <net/if_var.h> -#endif #include <net/if_dl.h> #include <net/if_types.h> #ifndef __osf__ diff --git a/contrib/ipfilter/ipsend/ip.c b/contrib/ipfilter/ipsend/ip.c index 74d164b..fc76170 100644 --- a/contrib/ipfilter/ipsend/ip.c +++ b/contrib/ipfilter/ipsend/ip.c @@ -21,9 +21,6 @@ static const char rcsid[] = "@(#)$Id$"; # include <net/route.h> # include <netinet/if_ether.h> # include <netinet/ip_var.h> -# if __FreeBSD_version >= 300000 -# include <net/if_var.h> -# endif #endif #include <errno.h> #include <stdio.h> diff --git a/contrib/ipfilter/ipsend/resend.c b/contrib/ipfilter/ipsend/resend.c index d113af3..45159bf 100644 --- a/contrib/ipfilter/ipsend/resend.c +++ b/contrib/ipfilter/ipsend/resend.c @@ -22,9 +22,6 @@ static const char rcsid[] = "@(#)$Id$"; #ifndef linux # include <netinet/ip_var.h> # include <netinet/if_ether.h> -# if __FreeBSD_version >= 300000 -# include <net/if_var.h> -# endif #endif #include <stdio.h> #include <netdb.h> diff --git a/contrib/ipfilter/lib/kmem.c b/contrib/ipfilter/lib/kmem.c index 382a51c..d895baf 100644 --- a/contrib/ipfilter/lib/kmem.c +++ b/contrib/ipfilter/lib/kmem.c @@ -29,9 +29,6 @@ #include <netinet/in_systm.h> #include <netinet/ip.h> #include <net/if.h> -#if __FreeBSD_version >= 300000 -# include <net/if_var.h> -#endif #if defined(linux) || defined(__osf__) || defined(__sgi) || defined(__hpux) # include <stdlib.h> #endif diff --git a/contrib/ipfilter/tools/ipfs.c b/contrib/ipfilter/tools/ipfs.c index b5484be..43abd74 100644 --- a/contrib/ipfilter/tools/ipfs.c +++ b/contrib/ipfilter/tools/ipfs.c @@ -33,9 +33,6 @@ #include <netinet/in_systm.h> #include <sys/time.h> #include <net/if.h> -#if __FreeBSD_version >= 300000 -# include <net/if_var.h> -#endif #include <netinet/ip.h> #include <netdb.h> #include <arpa/nameser.h> diff --git a/contrib/ipfilter/tools/ipnat.c b/contrib/ipfilter/tools/ipnat.c index 448c1c0..c3a7156 100644 --- a/contrib/ipfilter/tools/ipnat.c +++ b/contrib/ipfilter/tools/ipnat.c @@ -37,9 +37,6 @@ #include <netinet/ip.h> #include <netinet/tcp.h> #include <net/if.h> -#if __FreeBSD_version >= 300000 -# include <net/if_var.h> -#endif #include <netdb.h> #include <arpa/nameser.h> #include <arpa/inet.h> diff --git a/contrib/ipfilter/tools/ipnat_y.y b/contrib/ipfilter/tools/ipnat_y.y index 8c23403..39e6a92 100644 --- a/contrib/ipfilter/tools/ipnat_y.y +++ b/contrib/ipfilter/tools/ipnat_y.y @@ -35,9 +35,6 @@ #include <sys/time.h> #include <syslog.h> #include <net/if.h> -#if __FreeBSD_version >= 300000 -# include <net/if_var.h> -#endif #include <netdb.h> #include <arpa/nameser.h> #include <resolv.h> diff --git a/contrib/ipfilter/tools/ippool.c b/contrib/ipfilter/tools/ippool.c index 49cf7da..243932c 100644 --- a/contrib/ipfilter/tools/ippool.c +++ b/contrib/ipfilter/tools/ippool.c @@ -15,9 +15,6 @@ #include <sys/ioctl.h> #include <net/if.h> -#if __FreeBSD_version >= 300000 -# include <net/if_var.h> -#endif #include <netinet/in.h> #include <arpa/inet.h> diff --git a/contrib/ipfilter/tools/ippool_y.y b/contrib/ipfilter/tools/ippool_y.y index 3498745..93593ce 100644 --- a/contrib/ipfilter/tools/ippool_y.y +++ b/contrib/ipfilter/tools/ippool_y.y @@ -16,9 +16,6 @@ #include <sys/ioctl.h> #include <net/if.h> -#if __FreeBSD_version >= 300000 -# include <net/if_var.h> -#endif #include <netinet/in.h> #include <arpa/inet.h> diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c index c50374e..17c9b65 100644 --- a/lib/libc/net/getaddrinfo.c +++ b/lib/libc/net/getaddrinfo.c @@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$"); #include <ifaddrs.h> #include <sys/queue.h> #ifdef INET6 -#include <net/if_var.h> #include <sys/sysctl.h> #include <sys/ioctl.h> #include <netinet6/in6_var.h> diff --git a/lib/libc/net/name6.c b/lib/libc/net/name6.c index 97880a2..89effe6 100644 --- a/lib/libc/net/name6.c +++ b/lib/libc/net/name6.c @@ -94,7 +94,6 @@ __FBSDID("$FreeBSD$"); #include <netinet/in.h> #ifdef INET6 #include <net/if.h> -#include <net/if_var.h> #include <sys/sysctl.h> #include <sys/ioctl.h> #include <netinet6/in6_var.h> /* XXX */ diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c index c733373..3c3a757 100644 --- a/sbin/ifconfig/af_inet.c +++ b/sbin/ifconfig/af_inet.c @@ -46,7 +46,6 @@ static const char rcsid[] = #include <ifaddrs.h> #include <netinet/in.h> -#include <net/if_var.h> /* for struct ifaddr */ #include <netinet/in_var.h> #include <arpa/inet.h> #include <netdb.h> diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c index bff66e0..8a18401 100644 --- a/sbin/ifconfig/af_inet6.c +++ b/sbin/ifconfig/af_inet6.c @@ -48,7 +48,6 @@ static const char rcsid[] = #include <arpa/inet.h> #include <netinet/in.h> -#include <net/if_var.h> /* for struct ifaddr */ #include <netinet/in_var.h> #include <arpa/inet.h> #include <netdb.h> diff --git a/sbin/ifconfig/af_nd6.c b/sbin/ifconfig/af_nd6.c index 3a510a5..9a1be79 100644 --- a/sbin/ifconfig/af_nd6.c +++ b/sbin/ifconfig/af_nd6.c @@ -46,7 +46,6 @@ static const char rcsid[] = #include <arpa/inet.h> #include <netinet/in.h> -#include <net/if_var.h> #include <netinet/in_var.h> #include <arpa/inet.h> #include <netdb.h> diff --git a/sbin/ifconfig/carp.c b/sbin/ifconfig/carp.c index 2c58fcb..adff153 100644 --- a/sbin/ifconfig/carp.c +++ b/sbin/ifconfig/carp.c @@ -36,7 +36,6 @@ #include <unistd.h> #include <net/if.h> -#include <net/if_var.h> #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet/ip_carp.h> diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 9d38a27..4a79992 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -51,7 +51,6 @@ static const char rcsid[] = #include <net/ethernet.h> #include <net/if.h> -#include <net/if_var.h> #include <net/if_dl.h> #include <net/if_types.h> #include <net/route.h> diff --git a/sbin/ifconfig/ifvlan.c b/sbin/ifconfig/ifvlan.c index cefcbbc..1a3fbaa 100644 --- a/sbin/ifconfig/ifvlan.c +++ b/sbin/ifconfig/ifvlan.c @@ -40,7 +40,6 @@ #include <net/ethernet.h> #include <net/if.h> -#include <net/if_var.h> #include <net/if_vlan_var.h> #include <net/route.h> diff --git a/sbin/ifconfig/ifvxlan.c b/sbin/ifconfig/ifvxlan.c index 9aa84a2..48f5331 100644 --- a/sbin/ifconfig/ifvxlan.c +++ b/sbin/ifconfig/ifvxlan.c @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include <net/ethernet.h> #include <net/if.h> -#include <net/if_var.h> #include <net/if_vxlan.h> #include <net/route.h> #include <netinet/in.h> diff --git a/tools/tools/ath/athratestats/main.c b/tools/tools/ath/athratestats/main.c index 815ed91..3881e85 100644 --- a/tools/tools/ath/athratestats/main.c +++ b/tools/tools/ath/athratestats/main.c @@ -38,7 +38,6 @@ #include <net/ethernet.h> #include <net/if.h> #include <net/if_media.h> -#include <net/if_var.h> #include <stdio.h> #include <stdlib.h> diff --git a/tools/tools/cxgbtool/cxgbtool.c b/tools/tools/cxgbtool/cxgbtool.c index f73f1a4..8eaaf28 100644 --- a/tools/tools/cxgbtool/cxgbtool.c +++ b/tools/tools/cxgbtool/cxgbtool.c @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include <arpa/inet.h> #include <net/if.h> -#include <net/if_var.h> #include <net/if_types.h> #include <sys/endian.h> diff --git a/tools/tools/iwn/iwnstats/iwn_ioctl.c b/tools/tools/iwn/iwnstats/iwn_ioctl.c index 13c6153..97b2a91 100644 --- a/tools/tools/iwn/iwnstats/iwn_ioctl.c +++ b/tools/tools/iwn/iwnstats/iwn_ioctl.c @@ -38,7 +38,6 @@ #include <sys/socket.h> #include <net/if.h> #include <net/if_media.h> -#include <net/if_var.h> #include <stdio.h> #include <stdlib.h> diff --git a/usr.bin/bluetooth/btsockstat/btsockstat.c b/usr.bin/bluetooth/btsockstat/btsockstat.c index 20f4de8..a9c9354 100644 --- a/usr.bin/bluetooth/btsockstat/btsockstat.c +++ b/usr.bin/bluetooth/btsockstat/btsockstat.c @@ -38,7 +38,6 @@ #include <sys/socketvar.h> #include <net/if.h> -#include <net/if_var.h> #include <bluetooth.h> #include <err.h> diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls index a9ba860..525e143 100644 --- a/usr.bin/kdump/mkioctls +++ b/usr.bin/kdump/mkioctls @@ -54,7 +54,6 @@ BEGIN { print "#include <bsm/audit.h>" print "#include <net/ethernet.h>" print "#include <net/if.h>" - print "#include <net/if_var.h>" print "#ifdef PF" print "#include <net/pfvar.h>" print "#include <net/if_pfsync.h>" diff --git a/usr.bin/netstat/bpf.c b/usr.bin/netstat/bpf.c index b48f9a1..60546e3 100644 --- a/usr.bin/netstat/bpf.c +++ b/usr.bin/netstat/bpf.c @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$"); #include <sys/user.h> #include <net/if.h> -#include <net/if_var.h> #include <net/bpf.h> #include <net/bpfdesc.h> #include <arpa/inet.h> diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c index cc8405e..f04c531 100644 --- a/usr.bin/netstat/if.c +++ b/usr.bin/netstat/if.c @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include <sys/time.h> #include <net/if.h> -#include <net/if_var.h> #include <net/if_dl.h> #include <net/if_types.h> #include <net/ethernet.h> diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c index 0d2006a..3535f45 100644 --- a/usr.bin/netstat/inet6.c +++ b/usr.bin/netstat/inet6.c @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include <net/route.h> #include <net/if.h> -#include <net/if_var.h> #include <netinet/in.h> #include <netinet/ip6.h> #include <netinet/icmp6.h> diff --git a/usr.sbin/amd/include/config.h b/usr.sbin/amd/include/config.h index 5817a46..cffb82a 100644 --- a/usr.sbin/amd/include/config.h +++ b/usr.sbin/amd/include/config.h @@ -668,9 +668,6 @@ /* Define to 1 if you have the <net/if.h> header file. */ #define HAVE_NET_IF_H 1 -/* Define to 1 if you have the <net/if_var.h> header file. */ -#define HAVE_NET_IF_VAR_H 1 - /* Define to 1 if you have the <net/route.h> header file. */ #define HAVE_NET_ROUTE_H 1 diff --git a/usr.sbin/ancontrol/ancontrol.c b/usr.sbin/ancontrol/ancontrol.c index 839cdcb..4ff32ff 100644 --- a/usr.sbin/ancontrol/ancontrol.c +++ b/usr.sbin/ancontrol/ancontrol.c @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include <arpa/inet.h> #include <net/if.h> -#include <net/if_var.h> #include <net/ethernet.h> #include <dev/an/if_aironet_ieee.h> diff --git a/usr.sbin/ifmcstat/ifmcstat.c b/usr.sbin/ifmcstat/ifmcstat.c index d3798e3..4f3f444 100644 --- a/usr.sbin/ifmcstat/ifmcstat.c +++ b/usr.sbin/ifmcstat/ifmcstat.c @@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include <sys/tree.h> #include <net/if.h> -#include <net/if_var.h> #include <net/if_types.h> #include <net/if_dl.h> #include <net/route.h> diff --git a/usr.sbin/ip6addrctl/ip6addrctl.c b/usr.sbin/ip6addrctl/ip6addrctl.c index 6a730ff..d9bf89d 100644 --- a/usr.sbin/ip6addrctl/ip6addrctl.c +++ b/usr.sbin/ip6addrctl/ip6addrctl.c @@ -39,7 +39,6 @@ #include <sys/sysctl.h> #include <net/if.h> -#include <net/if_var.h> #include <netinet/in.h> #include <netinet6/in6_var.h> diff --git a/usr.sbin/mld6query/mld6.c b/usr.sbin/mld6query/mld6.c index 53f38ae..a3c8342 100644 --- a/usr.sbin/mld6query/mld6.c +++ b/usr.sbin/mld6query/mld6.c @@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include <signal.h> #include <net/if.h> -#include <net/if_var.h> #include <netinet/in.h> #include <netinet/ip6.h> diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index e896010..339a4b6 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -83,7 +83,6 @@ #include <sys/queue.h> #include <net/if.h> -#include <net/if_var.h> #include <net/if_dl.h> #include <net/if_types.h> #include <net/route.h> diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h index 6c49557..b771834 100644 --- a/usr.sbin/ntp/config.h +++ b/usr.sbin/ntp/config.h @@ -613,9 +613,6 @@ /* Define to 1 if you have the <net/if.h> header file. */ #define HAVE_NET_IF_H 1 -/* Define to 1 if you have the <net/if_var.h> header file. */ -#define HAVE_NET_IF_VAR_H 1 - /* Define to 1 if you have the <net/route.h> header file. */ #define HAVE_NET_ROUTE_H 1 diff --git a/usr.sbin/ppp/iface.c b/usr.sbin/ppp/iface.c index 8fee189..5f17769 100644 --- a/usr.sbin/ppp/iface.c +++ b/usr.sbin/ppp/iface.c @@ -31,9 +31,6 @@ #include <netinet/in.h> #include <net/if.h> #include <net/if_dl.h> -#ifdef __FreeBSD__ -#include <net/if_var.h> -#endif #include <net/route.h> #include <netinet/in_systm.h> #include <netinet/in_var.h> diff --git a/usr.sbin/rip6query/rip6query.c b/usr.sbin/rip6query/rip6query.c index ea448ba2..a35c750 100644 --- a/usr.sbin/rip6query/rip6query.c +++ b/usr.sbin/rip6query/rip6query.c @@ -46,9 +46,6 @@ #include <sys/queue.h> #include <net/if.h> -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 -#include <net/if_var.h> -#endif /* __FreeBSD__ >= 3 */ #include <netinet/in.h> #include <netinet/in_var.h> #include <arpa/inet.h> diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c index 258219b..3c3d9d3 100644 --- a/usr.sbin/route6d/route6d.c +++ b/usr.sbin/route6d/route6d.c @@ -63,7 +63,6 @@ static const char _rcsid[] = "$KAME: route6d.c,v 1.104 2003/10/31 00:30:20 itoju #include <sys/sysctl.h> #include <sys/uio.h> #include <net/if.h> -#include <net/if_var.h> #include <net/route.h> #include <netinet/in.h> #include <netinet/in_var.h> diff --git a/usr.sbin/rrenumd/lexer.l b/usr.sbin/rrenumd/lexer.l index 6e55f9e..47656e8 100644 --- a/usr.sbin/rrenumd/lexer.l +++ b/usr.sbin/rrenumd/lexer.l @@ -40,10 +40,6 @@ #include <string.h> #include <net/if.h> -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 -#include <net/if_var.h> -#endif /* __FreeBSD__ >= 3 */ - #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet/icmp6.h> diff --git a/usr.sbin/rrenumd/parser.y b/usr.sbin/rrenumd/parser.y index 65dfd46..6436df7 100644 --- a/usr.sbin/rrenumd/parser.y +++ b/usr.sbin/rrenumd/parser.y @@ -39,9 +39,6 @@ #include <sys/queue.h> #include <net/if.h> -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 -#include <net/if_var.h> -#endif /* __FreeBSD__ >= 3 */ #include <netinet/in.h> #include <netinet/in_var.h> diff --git a/usr.sbin/rtadvctl/rtadvctl.c b/usr.sbin/rtadvctl/rtadvctl.c index 3f22518..f1657d7 100644 --- a/usr.sbin/rtadvctl/rtadvctl.c +++ b/usr.sbin/rtadvctl/rtadvctl.c @@ -36,7 +36,6 @@ #include <net/if.h> #include <net/if_dl.h> #include <net/if_types.h> -#include <net/if_var.h> #include <net/ethernet.h> #include <netinet/in.h> #include <netinet/ip6.h> diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c index 5c9d778..4f14e0fb 100644 --- a/usr.sbin/rtadvd/config.c +++ b/usr.sbin/rtadvd/config.c @@ -36,7 +36,6 @@ #include <sys/socket.h> #include <net/if.h> -#include <net/if_var.h> #include <net/route.h> #include <net/if_dl.h> diff --git a/usr.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c index 5413cdf..0eef734 100644 --- a/usr.sbin/rtadvd/if.c +++ b/usr.sbin/rtadvd/if.c @@ -38,7 +38,6 @@ #include <net/if.h> #include <net/if_dl.h> #include <net/if_types.h> -#include <net/if_var.h> #include <net/ethernet.h> #include <net/route.h> #include <netinet/in.h> diff --git a/usr.sbin/rtadvd/rrenum.c b/usr.sbin/rtadvd/rrenum.c index 0c97d98..eede4b6 100644 --- a/usr.sbin/rtadvd/rrenum.c +++ b/usr.sbin/rtadvd/rrenum.c @@ -37,7 +37,6 @@ #include <net/if.h> #include <net/if_dl.h> -#include <net/if_var.h> #include <net/route.h> #include <netinet/in.h> #include <netinet/in_var.h> diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c index 6554b61..0169a56 100644 --- a/usr.sbin/rtadvd/rtadvd.c +++ b/usr.sbin/rtadvd/rtadvd.c @@ -51,7 +51,6 @@ #include <arpa/inet.h> -#include <net/if_var.h> #include <netinet/in_var.h> #include <netinet6/nd6.h> diff --git a/usr.sbin/rtsold/if.c b/usr.sbin/rtsold/if.c index 2bf946d..6274d0f 100644 --- a/usr.sbin/rtsold/if.c +++ b/usr.sbin/rtsold/if.c @@ -38,7 +38,6 @@ #include <sys/queue.h> #include <net/if.h> -#include <net/if_var.h> #include <net/if_types.h> #include <net/route.h> #include <net/if_dl.h> diff --git a/usr.sbin/rtsold/probe.c b/usr.sbin/rtsold/probe.c index 5ec54aa..89a1617a 100644 --- a/usr.sbin/rtsold/probe.c +++ b/usr.sbin/rtsold/probe.c @@ -40,7 +40,6 @@ #include <sys/queue.h> #include <net/if.h> -#include <net/if_var.h> #include <net/if_dl.h> #include <netinet/in.h> diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c index a97b884..bba15bb 100644 --- a/usr.sbin/rtsold/rtsold.c +++ b/usr.sbin/rtsold/rtsold.c @@ -38,7 +38,6 @@ #include <net/if.h> #include <net/if_dl.h> -#include <net/if_var.h> #include <netinet/in.h> #include <netinet/icmp6.h> diff --git a/usr.sbin/uhsoctl/uhsoctl.c b/usr.sbin/uhsoctl/uhsoctl.c index 21b6220..686d45f 100644 --- a/usr.sbin/uhsoctl/uhsoctl.c +++ b/usr.sbin/uhsoctl/uhsoctl.c @@ -37,7 +37,6 @@ #include <arpa/inet.h> #include <net/if.h> -#include <net/if_var.h> #include <net/if_dl.h> #include <net/route.h> #include <netinet/in.h> diff --git a/usr.sbin/wpa/ndis_events/ndis_events.c b/usr.sbin/wpa/ndis_events/ndis_events.c index 9c6e9de..b61fd0a 100644 --- a/usr.sbin/wpa/ndis_events/ndis_events.c +++ b/usr.sbin/wpa/ndis_events/ndis_events.c @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <net/if.h> #include <net/if_dl.h> -#include <net/if_var.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/usr.sbin/wpa/wpa_supplicant/Packet32.c b/usr.sbin/wpa/wpa_supplicant/Packet32.c index 876417e..8e7da03 100644 --- a/usr.sbin/wpa/wpa_supplicant/Packet32.c +++ b/usr.sbin/wpa/wpa_supplicant/Packet32.c @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include <sys/fcntl.h> #include <net/if.h> #include <net/if_dl.h> -#include <net/if_var.h> #include <netinet/in.h> #include <arpa/inet.h> |