diff options
author | Andy Grover <andy.grover@oracle.com> | 2009-08-21 08:28:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-23 22:13:09 -0400 |
commit | 40d866095df3bb70ded1813f4852cab445ef678b (patch) | |
tree | 681862ddcfe3706eacbacae324c6762e1c1f628c /net/rds/af_rds.c | |
parent | 616b757ae18fb8ec2dfe7ff9d3f589f82cb0eb9d (diff) |
RDS: Modularize RDMA and TCP transports
Enable the building of transports as modules.
Also, improve consistency of Kconfig messages in relation to other
protocols, and move build dependency on IB from the RDS core code
to the rds_rdma module.
Signed-off-by: Andy Grover <andy.grover@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds/af_rds.c')
-rw-r--r-- | net/rds/af_rds.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c index b11e7e527864..108ed2e671c5 100644 --- a/net/rds/af_rds.c +++ b/net/rds/af_rds.c | |||
@@ -39,7 +39,6 @@ | |||
39 | 39 | ||
40 | #include "rds.h" | 40 | #include "rds.h" |
41 | #include "rdma.h" | 41 | #include "rdma.h" |
42 | #include "rdma_transport.h" | ||
43 | 42 | ||
44 | /* this is just used for stats gathering :/ */ | 43 | /* this is just used for stats gathering :/ */ |
45 | static DEFINE_SPINLOCK(rds_sock_lock); | 44 | static DEFINE_SPINLOCK(rds_sock_lock); |
@@ -509,7 +508,6 @@ out: | |||
509 | 508 | ||
510 | static void __exit rds_exit(void) | 509 | static void __exit rds_exit(void) |
511 | { | 510 | { |
512 | rds_rdma_exit(); | ||
513 | sock_unregister(rds_family_ops.family); | 511 | sock_unregister(rds_family_ops.family); |
514 | proto_unregister(&rds_proto); | 512 | proto_unregister(&rds_proto); |
515 | rds_conn_exit(); | 513 | rds_conn_exit(); |
@@ -549,14 +547,8 @@ static int __init rds_init(void) | |||
549 | rds_info_register_func(RDS_INFO_SOCKETS, rds_sock_info); | 547 | rds_info_register_func(RDS_INFO_SOCKETS, rds_sock_info); |
550 | rds_info_register_func(RDS_INFO_RECV_MESSAGES, rds_sock_inc_info); | 548 | rds_info_register_func(RDS_INFO_RECV_MESSAGES, rds_sock_inc_info); |
551 | 549 | ||
552 | /* ib/iwarp transports currently compiled-in */ | ||
553 | ret = rds_rdma_init(); | ||
554 | if (ret) | ||
555 | goto out_sock; | ||
556 | goto out; | 550 | goto out; |
557 | 551 | ||
558 | out_sock: | ||
559 | sock_unregister(rds_family_ops.family); | ||
560 | out_proto: | 552 | out_proto: |
561 | proto_unregister(&rds_proto); | 553 | proto_unregister(&rds_proto); |
562 | out_stats: | 554 | out_stats: |