diff options
author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-11-12 16:58:46 +0000 |
---|---|---|
committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-11-12 16:58:46 +0000 |
commit | 63c2df37b714eb524915fa4aa18e43aab527fbf3 (patch) | |
tree | babd18eccb1990c3b5991c2af47096b1839858cc /sys/netinet | |
parent | 994bbe04b03f3beed65ee24c32fb302e916fff89 (diff) |
Sync headers and get rid of #ifdef MROUTING.
Diffstat (limited to 'sys/netinet')
-rw-r--r-- | sys/netinet/ip_mroute.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 7da94bf5563..0ead255eb0a 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_mroute.c,v 1.84 2015/11/12 16:48:53 mpi Exp $ */ +/* $OpenBSD: ip_mroute.c,v 1.85 2015/11/12 16:58:45 mpi Exp $ */ /* $NetBSD: ip_mroute.c,v 1.85 2004/04/26 01:31:57 matt Exp $ */ /* @@ -67,14 +67,14 @@ #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/protosw.h> -#include <sys/errno.h> -#include <sys/time.h> #include <sys/kernel.h> #include <sys/ioctl.h> #include <sys/syslog.h> #include <sys/sysctl.h> #include <sys/timeout.h> +#include <crypto/siphash.h> + #include <net/if.h> #include <net/if_var.h> #include <net/route.h> @@ -83,19 +83,15 @@ #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/in_pcb.h> -#include <netinet/udp.h> #include <netinet/igmp.h> #include <netinet/igmp_var.h> #include <netinet/ip_mroute.h> + #ifdef PIM #include <netinet/pim.h> #include <netinet/pim_var.h> #endif -#include <sys/stdarg.h> - -#include <crypto/siphash.h> - #define IP_MULTICASTOPTS 0 #define M_PULLUP(m, len) \ do { \ |