Commit 026321c6 authored by Jon Maloy's avatar Jon Maloy Committed by David S. Miller

tipc: rename tipc_server to tipc_topsrv

We rename struct tipc_server to struct tipc_topsrv. This reflect its now
specialized role as topology server. Accoringly, we change or add function
prefixes to make it clearer which functionality those belong to.

There are no functional changes in this commit.
Acked-by: default avatarYing.Xue <ying.xue@windriver.com>
Signed-off-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0ef897be
...@@ -9,7 +9,7 @@ tipc-y += addr.o bcast.o bearer.o \ ...@@ -9,7 +9,7 @@ tipc-y += addr.o bcast.o bearer.o \
core.o link.o discover.o msg.o \ core.o link.o discover.o msg.o \
name_distr.o subscr.o monitor.o name_table.o net.o \ name_distr.o subscr.o monitor.o name_table.o net.o \
netlink.o netlink_compat.o node.o socket.o eth_media.o \ netlink.o netlink_compat.o node.o socket.o eth_media.o \
server.o socket.o group.o topsrv.o socket.o group.o
tipc-$(CONFIG_TIPC_MEDIA_UDP) += udp_media.o tipc-$(CONFIG_TIPC_MEDIA_UDP) += udp_media.o
tipc-$(CONFIG_TIPC_MEDIA_IB) += ib_media.o tipc-$(CONFIG_TIPC_MEDIA_IB) += ib_media.o
......
...@@ -64,7 +64,7 @@ struct tipc_bearer; ...@@ -64,7 +64,7 @@ struct tipc_bearer;
struct tipc_bc_base; struct tipc_bc_base;
struct tipc_link; struct tipc_link;
struct tipc_name_table; struct tipc_name_table;
struct tipc_server; struct tipc_topsrv;
struct tipc_monitor; struct tipc_monitor;
#define TIPC_MOD_VER "2.0.0" #define TIPC_MOD_VER "2.0.0"
...@@ -112,7 +112,7 @@ struct tipc_net { ...@@ -112,7 +112,7 @@ struct tipc_net {
struct list_head dist_queue; struct list_head dist_queue;
/* Topology subscription server */ /* Topology subscription server */
struct tipc_server *topsrv; struct tipc_topsrv *topsrv;
atomic_t subscription_count; atomic_t subscription_count;
}; };
...@@ -131,7 +131,7 @@ static inline struct list_head *tipc_nodes(struct net *net) ...@@ -131,7 +131,7 @@ static inline struct list_head *tipc_nodes(struct net *net)
return &tipc_net(net)->node_list; return &tipc_net(net)->node_list;
} }
static inline struct tipc_server *tipc_topsrv(struct net *net) static inline struct tipc_topsrv *tipc_topsrv(struct net *net)
{ {
return tipc_net(net)->topsrv; return tipc_net(net)->topsrv;
} }
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include "addr.h" #include "addr.h"
#include "group.h" #include "group.h"
#include "bcast.h" #include "bcast.h"
#include "server.h" #include "topsrv.h"
#include "msg.h" #include "msg.h"
#include "socket.h" #include "socket.h"
#include "node.h" #include "node.h"
......
...@@ -51,7 +51,7 @@ static void tipc_sub_send_event(struct tipc_subscription *sub, ...@@ -51,7 +51,7 @@ static void tipc_sub_send_event(struct tipc_subscription *sub,
tipc_evt_write(evt, found_upper, found_upper); tipc_evt_write(evt, found_upper, found_upper);
tipc_evt_write(evt, port.ref, port); tipc_evt_write(evt, port.ref, port);
tipc_evt_write(evt, port.node, node); tipc_evt_write(evt, port.node, node);
tipc_conn_queue_evt(sub->net, sub->conid, event, evt); tipc_topsrv_queue_evt(sub->net, sub->conid, event, evt);
} }
/** /**
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#ifndef _TIPC_SUBSCR_H #ifndef _TIPC_SUBSCR_H
#define _TIPC_SUBSCR_H #define _TIPC_SUBSCR_H
#include "server.h" #include "topsrv.h"
#define TIPC_MAX_SUBSCR 65535 #define TIPC_MAX_SUBSCR 65535
#define TIPC_MAX_PUBLICATIONS 65535 #define TIPC_MAX_PUBLICATIONS 65535
......
This diff is collapsed.
...@@ -38,16 +38,13 @@ ...@@ -38,16 +38,13 @@
#define _TIPC_SERVER_H #define _TIPC_SERVER_H
#include "core.h" #include "core.h"
#include <linux/idr.h>
#include <linux/tipc.h>
#include <net/net_namespace.h>
#define TIPC_SERVER_NAME_LEN 32 #define TIPC_SERVER_NAME_LEN 32
#define TIPC_SUB_CLUSTER_SCOPE 0x20 #define TIPC_SUB_CLUSTER_SCOPE 0x20
#define TIPC_SUB_NODE_SCOPE 0x40 #define TIPC_SUB_NODE_SCOPE 0x40
#define TIPC_SUB_NO_STATUS 0x80 #define TIPC_SUB_NO_STATUS 0x80
void tipc_conn_queue_evt(struct net *net, int conid, void tipc_topsrv_queue_evt(struct net *net, int conid,
u32 event, struct tipc_event *evt); u32 event, struct tipc_event *evt);
bool tipc_topsrv_kern_subscr(struct net *net, u32 port, u32 type, u32 lower, bool tipc_topsrv_kern_subscr(struct net *net, u32 port, u32 type, u32 lower,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment