Date: Wed, 3 Sep 2008 17:58:05 GMT From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 149134 for review Message-ID: <200809031758.m83Hw5kp053102@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=149134 Change 149134 by julian@julian_trafmon1 on 2008/09/03 17:57:41 Slightly clean up which files include which files. This may change but for now let's be consistent. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if.h#5 edit .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#6 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in.h#3 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if.h#5 (text+ko) ==== @@ -458,8 +458,4 @@ #include <net/if_var.h> #endif -#ifdef _KERNEL -#include <net/vnet.h> -#endif - #endif /* !_NET_IF_H_ */ ==== //depot/projects/vimage-commit2/src/sys/net/if_var.h#6 (text+ko) ==== @@ -713,6 +713,8 @@ int ether_poll_deregister(struct ifnet *ifp); #endif /* DEVICE_POLLING */ +#include <net/vnet.h> + #endif /* _KERNEL */ #endif /* !_NET_IF_VAR_H_ */ ==== //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#4 (text+ko) ==== @@ -1183,70 +1183,6 @@ #define NGI_GET_META(i,m) #define ng_copy_meta(meta) NULL +#include <netgraph/vnetgraph.h> + #endif /* _NETGRAPH_NETGRAPH_H_ */ -/*- - * Copyright (c) 2006-2008 University of Zagreb - * Copyright (c) 2006-2008 FreeBSD Foundation - * - * This software was developed by the University of Zagreb and the - * FreeBSD Foundation under sponsorship by the Stichting NLnet and the - * FreeBSD Foundation. - * - * 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. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. - */ - -#ifndef _NETGRAPH_VNETGRPAH_H_ -#define _NETGRAPH_VNETGRAPH_H_ - -#include <netgraph/ng_message.h> - -#define INIT_VNET_NETGRAPH(vnet) \ - INIT_FROM_VNET(vnet, VNET_MOD_NETGRAPH, \ - struct vnet_netgraph, vnet_netgraph) - -#define VNET_NETGRAPH(sym) VSYM(vnet_netgraph, sym) - -#define NG_ID_HASH_SIZE 32 /* most systems wont need even this many */ -#define NG_NAME_HASH_SIZE 128 /* most systems wont need even this many */ - -#ifdef VIMAGE -struct vnet_netgraph { - LIST_HEAD(, ng_node) _ng_ID_hash[NG_ID_HASH_SIZE]; - LIST_HEAD(, ng_node) _ng_name_hash[NG_ID_HASH_SIZE]; - LIST_HEAD(, ng_node) _ng_nodelist; - ng_ID_t _nextID; - struct unrhdr *_ng_iface_unit; - struct unrhdr *_ng_eiface_unit; - struct unrhdr *_ng_wormhole_unit; -}; -#endif - -/* Symbol translation macros */ -#define V_ng_ID_hash VNET_NETGRAPH(ng_ID_hash) -#define V_ng_name_hash VNET_NETGRAPH(ng_name_hash) -#define V_ng_nodelist VNET_NETGRAPH(ng_nodelist) -#define V_nextID VNET_NETGRAPH(nextID) -#define V_ng_iface_unit VNET_NETGRAPH(ng_iface_unit) -#define V_ng_eiface_unit VNET_NETGRAPH(ng_eiface_unit) -#define V_ng_wormhole_unit VNET_NETGRAPH(ng_wormhole_unit) - -#endif /* !_NETGRAPH_VNETGRAPH_H_ */ ==== //depot/projects/vimage-commit2/src/sys/netinet/in.h#3 (text+ko) ==== @@ -743,7 +743,6 @@ #undef __KAME_NETINET_IN_H_INCLUDED_ #endif - #ifdef _KERNEL #include <netinet/vinet.h> #endifhelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809031758.m83Hw5kp053102>