diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2006-03-20 21:24:19 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-03-20 21:24:19 -0800 |
| commit | 075ae86611011e1acdda9df6a7e30f8508b31fd6 (patch) | |
| tree | 964bd1489ca16e3bbdc41a455b2a2db8e7801f2a /net/dccp | |
| parent | 0a1ec676ddbee712e1c1da679be4bdc529caf215 (diff) | |
| download | kernel_samsung_crespo-075ae86611011e1acdda9df6a7e30f8508b31fd6.zip kernel_samsung_crespo-075ae86611011e1acdda9df6a7e30f8508b31fd6.tar.gz kernel_samsung_crespo-075ae86611011e1acdda9df6a7e30f8508b31fd6.tar.bz2 | |
[DCCP]: Move dccp_hashinfo from ipv4.c to the core
As it is used by both ipv4 and ipv6.
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
| -rw-r--r-- | net/dccp/ipv4.c | 8 | ||||
| -rw-r--r-- | net/dccp/proto.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index f087593..a7332f0 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -30,14 +30,6 @@ #include "dccp.h" #include "feat.h" -struct inet_hashinfo __cacheline_aligned dccp_hashinfo = { - .lhash_lock = RW_LOCK_UNLOCKED, - .lhash_users = ATOMIC_INIT(0), - .lhash_wait = __WAIT_QUEUE_HEAD_INITIALIZER(dccp_hashinfo.lhash_wait), -}; - -EXPORT_SYMBOL_GPL(dccp_hashinfo); - static int dccp_v4_get_port(struct sock *sk, const unsigned short snum) { return inet_csk_get_port(&dccp_hashinfo, sk, snum, diff --git a/net/dccp/proto.c b/net/dccp/proto.c index 64806fb..3ba1ff4 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c @@ -47,6 +47,14 @@ atomic_t dccp_orphan_count = ATOMIC_INIT(0); EXPORT_SYMBOL_GPL(dccp_orphan_count); +struct inet_hashinfo __cacheline_aligned dccp_hashinfo = { + .lhash_lock = RW_LOCK_UNLOCKED, + .lhash_users = ATOMIC_INIT(0), + .lhash_wait = __WAIT_QUEUE_HEAD_INITIALIZER(dccp_hashinfo.lhash_wait), +}; + +EXPORT_SYMBOL_GPL(dccp_hashinfo); + static struct net_protocol dccp_protocol = { .handler = dccp_v4_rcv, .err_handler = dccp_v4_err, |