diff options
| author | zec <zec@FreeBSD.org> | 2008-11-28 23:30:51 +0000 |
|---|---|---|
| committer | zec <zec@FreeBSD.org> | 2008-11-28 23:30:51 +0000 |
| commit | 7ecd715d484a68ba07dae8dcb30670d691129c07 (patch) | |
| tree | bb923196c85b9e71d363a7650c292edddfbc6beb /sys/netgraph | |
| parent | d8aff71262b6224530a865344e20823189bd5cb1 (diff) | |
| download | FreeBSD-src-7ecd715d484a68ba07dae8dcb30670d691129c07.zip FreeBSD-src-7ecd715d484a68ba07dae8dcb30670d691129c07.tar.gz | |
Unhide declarations of network stack virtualization structs from
underneath #ifdef VIMAGE blocks.
This change introduces some churn in #include ordering and nesting
throughout the network stack and drivers but is not expected to cause
any additional issues.
In the next step this will allow us to instantiate the virtualization
container structures and switch from using global variables to their
"containerized" counterparts.
Reviewed by: bz, julian
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
Diffstat (limited to 'sys/netgraph')
| -rw-r--r-- | sys/netgraph/netgraph.h | 11 | ||||
| -rw-r--r-- | sys/netgraph/ng_base.c | 1 | ||||
| -rw-r--r-- | sys/netgraph/ng_eiface.c | 3 |
3 files changed, 11 insertions, 4 deletions
diff --git a/sys/netgraph/netgraph.h b/sys/netgraph/netgraph.h index 78af963..0def641 100644 --- a/sys/netgraph/netgraph.h +++ b/sys/netgraph/netgraph.h @@ -1186,6 +1186,7 @@ typedef void *meta_p; /* Hash related definitions */ #define NG_ID_HASH_SIZE 128 /* most systems wont need even this many */ +#define NG_NAME_HASH_SIZE 128 /* most systems wont need even this many */ /* Virtualization macros */ #define INIT_VNET_NETGRAPH(vnet) \ @@ -1194,6 +1195,16 @@ typedef void *meta_p; #define VNET_NETGRAPH(sym) VSYM(vnet_netgraph, sym) +struct vnet_netgraph { + LIST_HEAD(, ng_node) _ng_ID_hash[NG_ID_HASH_SIZE]; + LIST_HEAD(, ng_node) _ng_name_hash[NG_NAME_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; +}; + /* Symbol translation macros */ #define V_nextID VNET_NETGRAPH(nextID) #define V_ng_ID_hash VNET_NETGRAPH(ng_ID_hash) diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c index 263469a..24ed885 100644 --- a/sys/netgraph/ng_base.c +++ b/sys/netgraph/ng_base.c @@ -183,7 +183,6 @@ static struct mtx ng_idhash_mtx; } \ } while (0) -#define NG_NAME_HASH_SIZE 128 /* most systems wont need even this many */ static LIST_HEAD(, ng_node) ng_name_hash[NG_NAME_HASH_SIZE]; static struct mtx ng_namehash_mtx; #define NG_NAMEHASH(NAME, HASH) \ diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c index 09011d2..1c952cd 100644 --- a/sys/netgraph/ng_eiface.c +++ b/sys/netgraph/ng_eiface.c @@ -447,8 +447,6 @@ ng_eiface_rcvmsg(node_p node, item_p item, hook_p lasthook) caddr_t ptr; int buflen; -#define SA_SIZE(s) ((s)->sa_len<sizeof(*(s))? sizeof(*(s)):(s)->sa_len) - /* Determine size of response and allocate it */ buflen = 0; TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) @@ -474,7 +472,6 @@ ng_eiface_rcvmsg(node_p node, item_p item, hook_p lasthook) buflen -= len; } break; -#undef SA_SIZE } default: |
