Date: Fri, 13 Feb 2009 15:37:15 +0000 (UTC) From: Luigi Rizzo <luigi@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r188580 - head/sys/netinet Message-ID: <200902131537.n1DFbFAC092341@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: luigi Date: Fri Feb 13 15:37:14 2009 New Revision: 188580 URL: http://svn.freebsd.org/changeset/base/188580 Log: remove unnecessary #include, and document some of the others Modified: head/sys/netinet/ip_dummynet.c head/sys/netinet/ip_fw2.c Modified: head/sys/netinet/ip_dummynet.c ============================================================================== --- head/sys/netinet/ip_dummynet.c Fri Feb 13 15:32:03 2009 (r188579) +++ head/sys/netinet/ip_dummynet.c Fri Feb 13 15:37:14 2009 (r188580) @@ -72,18 +72,15 @@ __FBSDID("$FreeBSD$"); #include <sys/time.h> #include <sys/sysctl.h> #include <sys/taskqueue.h> -#include <net/if.h> +#include <net/if.h> /* IFNAMSIZ, struct ifaddr, ifq head, lock.h mutex.h */ #include <net/netisr.h> -#include <net/route.h> #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/in_var.h> -#include <netinet/ip.h> +#include <netinet/ip.h> /* ip_len, ip_off */ #include <netinet/ip_fw.h> #include <netinet/ip_dummynet.h> -#include <netinet/ip_var.h> +#include <netinet/ip_var.h> /* ip_output(), IP_FORWARDING */ -#include <netinet/if_ether.h> /* for struct arpcom */ +#include <netinet/if_ether.h> /* various ether_* routines */ #include <netinet/ip6.h> /* for ip6_input, ip6_output prototypes */ #include <netinet6/ip6_var.h> @@ -157,6 +154,9 @@ static struct callout dn_timeout; extern void (*bridge_dn_p)(struct mbuf *, struct ifnet *); #ifdef SYSCTL_NODE +SYSCTL_DECL(_net_inet); +SYSCTL_DECL(_net_inet_ip); + SYSCTL_NODE(_net_inet_ip, OID_AUTO, dummynet, CTLFLAG_RW, 0, "Dummynet"); SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, hash_size, CTLFLAG_RW, &dn_hash_size, 0, "Default hash table size"); @@ -892,7 +892,7 @@ dummynet_send(struct mbuf *m) case DN_TO_IP_OUT: ip_output(m, NULL, NULL, IP_FORWARDING, NULL, NULL); break ; - case DN_TO_IP_IN : + case DN_TO_IP_IN : ip = mtod(m, struct ip *); ip->ip_len = htons(ip->ip_len); ip->ip_off = htons(ip->ip_off); Modified: head/sys/netinet/ip_fw2.c ============================================================================== --- head/sys/netinet/ip_fw2.c Fri Feb 13 15:32:03 2009 (r188579) +++ head/sys/netinet/ip_fw2.c Fri Feb 13 15:37:14 2009 (r188580) @@ -74,7 +74,6 @@ __FBSDID("$FreeBSD$"); #define IPFW_INTERNAL /* Access to protected data structures in ip_fw.h. */ #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/in_var.h> #include <netinet/in_pcb.h> #include <netinet/ip.h> @@ -85,10 +84,7 @@ __FBSDID("$FreeBSD$"); #include <netinet/ip_dummynet.h> #include <netinet/ip_carp.h> #include <netinet/pim.h> -#include <netinet/tcp.h> -#include <netinet/tcp_timer.h> #include <netinet/tcp_var.h> -#include <netinet/tcpip.h> #include <netinet/udp.h> #include <netinet/udp_var.h> #include <netinet/sctp.h> @@ -96,8 +92,6 @@ __FBSDID("$FreeBSD$"); #include <netgraph/ng_ipfw.h> -#include <altq/if_altq.h> - #include <netinet/ip6.h> #include <netinet/icmp6.h> #ifdef INET6 @@ -108,7 +102,9 @@ __FBSDID("$FreeBSD$"); #include <machine/in_cksum.h> /* XXX for in_cksum */ +#ifdef MAC #include <security/mac/mac_framework.h> +#endif #ifndef VIMAGE #ifndef VIMAGE_GLOBALS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902131537.n1DFbFAC092341>