diff options
author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2006-03-21 00:24:19 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-03-21 00:24:19 -0500 |
commit | 075ae86611011e1acdda9df6a7e30f8508b31fd6 (patch) | |
tree | 964bd1489ca16e3bbdc41a455b2a2db8e7801f2a | |
parent | 0a1ec676ddbee712e1c1da679be4bdc529caf215 (diff) |
[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>
-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 f087593d64d3..a7332f0f85c4 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
@@ -30,14 +30,6 @@ | |||
30 | #include "dccp.h" | 30 | #include "dccp.h" |
31 | #include "feat.h" | 31 | #include "feat.h" |
32 | 32 | ||
33 | struct inet_hashinfo __cacheline_aligned dccp_hashinfo = { | ||
34 | .lhash_lock = RW_LOCK_UNLOCKED, | ||
35 | .lhash_users = ATOMIC_INIT(0), | ||
36 | .lhash_wait = __WAIT_QUEUE_HEAD_INITIALIZER(dccp_hashinfo.lhash_wait), | ||
37 | }; | ||
38 | |||
39 | EXPORT_SYMBOL_GPL(dccp_hashinfo); | ||
40 | |||
41 | static int dccp_v4_get_port(struct sock *sk, const unsigned short snum) | 33 | static int dccp_v4_get_port(struct sock *sk, const unsigned short snum) |
42 | { | 34 | { |
43 | return inet_csk_get_port(&dccp_hashinfo, sk, snum, | 35 | return inet_csk_get_port(&dccp_hashinfo, sk, snum, |
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index 64806fbf44de..3ba1ff435798 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c | |||
@@ -47,6 +47,14 @@ atomic_t dccp_orphan_count = ATOMIC_INIT(0); | |||
47 | 47 | ||
48 | EXPORT_SYMBOL_GPL(dccp_orphan_count); | 48 | EXPORT_SYMBOL_GPL(dccp_orphan_count); |
49 | 49 | ||
50 | struct inet_hashinfo __cacheline_aligned dccp_hashinfo = { | ||
51 | .lhash_lock = RW_LOCK_UNLOCKED, | ||
52 | .lhash_users = ATOMIC_INIT(0), | ||
53 | .lhash_wait = __WAIT_QUEUE_HEAD_INITIALIZER(dccp_hashinfo.lhash_wait), | ||
54 | }; | ||
55 | |||
56 | EXPORT_SYMBOL_GPL(dccp_hashinfo); | ||
57 | |||
50 | static struct net_protocol dccp_protocol = { | 58 | static struct net_protocol dccp_protocol = { |
51 | .handler = dccp_v4_rcv, | 59 | .handler = dccp_v4_rcv, |
52 | .err_handler = dccp_v4_err, | 60 | .err_handler = dccp_v4_err, |