Skip to content

Commit

Permalink
tipc: remove files ref.h and ref.c
Browse files Browse the repository at this point in the history
The reference table is now 'socket aware' instead of being generic,
and has in reality become a socket internal table. In order to be
able to minimize the API exposed by the socket layer towards the rest
of the stack, we now move the reference table definitions and functions
into the file socket.c, and rename the functions accordingly.

There are no functional changes in this commit.

Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jon Paul Maloy authored and David S. Miller committed Aug 23, 2014
1 parent 2e84c60 commit 808d90f
Show file tree
Hide file tree
Showing 6 changed files with 250 additions and 334 deletions.
2 changes: 1 addition & 1 deletion net/tipc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ obj-$(CONFIG_TIPC) := tipc.o
tipc-y += addr.o bcast.o bearer.o config.o \
core.o link.o discover.o msg.o \
name_distr.o subscr.o name_table.o net.o \
netlink.o node.o node_subscr.o ref.o \
netlink.o node.o node_subscr.o \
socket.o log.o eth_media.o server.o

tipc-$(CONFIG_TIPC_MEDIA_IB) += ib_media.o
Expand Down
7 changes: 3 additions & 4 deletions net/tipc/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
*/

#include "core.h"
#include "ref.h"
#include "name_table.h"
#include "subscr.h"
#include "config.h"
Expand Down Expand Up @@ -85,7 +84,7 @@ static void tipc_core_stop(void)
tipc_netlink_stop();
tipc_subscr_stop();
tipc_nametbl_stop();
tipc_ref_table_stop();
tipc_sk_ref_table_stop();
tipc_socket_stop();
tipc_unregister_sysctl();
}
Expand All @@ -99,7 +98,7 @@ static int tipc_core_start(void)

get_random_bytes(&tipc_random, sizeof(tipc_random));

err = tipc_ref_table_init(tipc_max_ports, tipc_random);
err = tipc_sk_ref_table_init(tipc_max_ports, tipc_random);
if (err)
goto out_reftbl;

Expand Down Expand Up @@ -139,7 +138,7 @@ static int tipc_core_start(void)
out_netlink:
tipc_nametbl_stop();
out_nametbl:
tipc_ref_table_stop();
tipc_sk_ref_table_stop();
out_reftbl:
return err;
}
Expand Down
270 changes: 0 additions & 270 deletions net/tipc/ref.c

This file was deleted.

56 changes: 0 additions & 56 deletions net/tipc/ref.h

This file was deleted.

Loading

0 comments on commit 808d90f

Please sign in to comment.