|
@@ -40,14 +40,14 @@
|
|
#include "subscr.h"
|
|
#include "subscr.h"
|
|
|
|
|
|
/**
|
|
/**
|
|
- * struct subscriber - TIPC network topology subscriber
|
|
|
|
|
|
+ * struct tipc_subscriber - TIPC network topology subscriber
|
|
* @port_ref: object reference to server port connecting to subscriber
|
|
* @port_ref: object reference to server port connecting to subscriber
|
|
* @lock: pointer to spinlock controlling access to subscriber's server port
|
|
* @lock: pointer to spinlock controlling access to subscriber's server port
|
|
* @subscriber_list: adjacent subscribers in top. server's list of subscribers
|
|
* @subscriber_list: adjacent subscribers in top. server's list of subscribers
|
|
* @subscription_list: list of subscription objects for this subscriber
|
|
* @subscription_list: list of subscription objects for this subscriber
|
|
*/
|
|
*/
|
|
|
|
|
|
-struct subscriber {
|
|
|
|
|
|
+struct tipc_subscriber {
|
|
u32 port_ref;
|
|
u32 port_ref;
|
|
spinlock_t *lock;
|
|
spinlock_t *lock;
|
|
struct list_head subscriber_list;
|
|
struct list_head subscriber_list;
|
|
@@ -224,7 +224,7 @@ static void subscr_del(struct tipc_subscription *sub)
|
|
* simply wait for it to be released, then claim it.)
|
|
* simply wait for it to be released, then claim it.)
|
|
*/
|
|
*/
|
|
|
|
|
|
-static void subscr_terminate(struct subscriber *subscriber)
|
|
|
|
|
|
+static void subscr_terminate(struct tipc_subscriber *subscriber)
|
|
{
|
|
{
|
|
u32 port_ref;
|
|
u32 port_ref;
|
|
struct tipc_subscription *sub;
|
|
struct tipc_subscription *sub;
|
|
@@ -278,7 +278,7 @@ static void subscr_terminate(struct subscriber *subscriber)
|
|
*/
|
|
*/
|
|
|
|
|
|
static void subscr_cancel(struct tipc_subscr *s,
|
|
static void subscr_cancel(struct tipc_subscr *s,
|
|
- struct subscriber *subscriber)
|
|
|
|
|
|
+ struct tipc_subscriber *subscriber)
|
|
{
|
|
{
|
|
struct tipc_subscription *sub;
|
|
struct tipc_subscription *sub;
|
|
struct tipc_subscription *sub_temp;
|
|
struct tipc_subscription *sub_temp;
|
|
@@ -315,7 +315,7 @@ static void subscr_cancel(struct tipc_subscr *s,
|
|
*/
|
|
*/
|
|
|
|
|
|
static struct tipc_subscription *subscr_subscribe(struct tipc_subscr *s,
|
|
static struct tipc_subscription *subscr_subscribe(struct tipc_subscr *s,
|
|
- struct subscriber *subscriber)
|
|
|
|
|
|
+ struct tipc_subscriber *subscriber)
|
|
{
|
|
{
|
|
struct tipc_subscription *sub;
|
|
struct tipc_subscription *sub;
|
|
int swap;
|
|
int swap;
|
|
@@ -393,7 +393,7 @@ static void subscr_conn_shutdown_event(void *usr_handle,
|
|
unsigned int size,
|
|
unsigned int size,
|
|
int reason)
|
|
int reason)
|
|
{
|
|
{
|
|
- struct subscriber *subscriber = usr_handle;
|
|
|
|
|
|
+ struct tipc_subscriber *subscriber = usr_handle;
|
|
spinlock_t *subscriber_lock;
|
|
spinlock_t *subscriber_lock;
|
|
|
|
|
|
if (tipc_port_lock(port_ref) == NULL)
|
|
if (tipc_port_lock(port_ref) == NULL)
|
|
@@ -416,7 +416,7 @@ static void subscr_conn_msg_event(void *usr_handle,
|
|
const unchar *data,
|
|
const unchar *data,
|
|
u32 size)
|
|
u32 size)
|
|
{
|
|
{
|
|
- struct subscriber *subscriber = usr_handle;
|
|
|
|
|
|
+ struct tipc_subscriber *subscriber = usr_handle;
|
|
spinlock_t *subscriber_lock;
|
|
spinlock_t *subscriber_lock;
|
|
struct tipc_subscription *sub;
|
|
struct tipc_subscription *sub;
|
|
|
|
|
|
@@ -471,12 +471,12 @@ static void subscr_named_msg_event(void *usr_handle,
|
|
struct tipc_portid const *orig,
|
|
struct tipc_portid const *orig,
|
|
struct tipc_name_seq const *dest)
|
|
struct tipc_name_seq const *dest)
|
|
{
|
|
{
|
|
- struct subscriber *subscriber;
|
|
|
|
|
|
+ struct tipc_subscriber *subscriber;
|
|
u32 server_port_ref;
|
|
u32 server_port_ref;
|
|
|
|
|
|
/* Create subscriber object */
|
|
/* Create subscriber object */
|
|
|
|
|
|
- subscriber = kzalloc(sizeof(struct subscriber), GFP_ATOMIC);
|
|
|
|
|
|
+ subscriber = kzalloc(sizeof(struct tipc_subscriber), GFP_ATOMIC);
|
|
if (subscriber == NULL) {
|
|
if (subscriber == NULL) {
|
|
warn("Subscriber rejected, no memory\n");
|
|
warn("Subscriber rejected, no memory\n");
|
|
return;
|
|
return;
|
|
@@ -568,8 +568,8 @@ failed:
|
|
|
|
|
|
void tipc_subscr_stop(void)
|
|
void tipc_subscr_stop(void)
|
|
{
|
|
{
|
|
- struct subscriber *subscriber;
|
|
|
|
- struct subscriber *subscriber_temp;
|
|
|
|
|
|
+ struct tipc_subscriber *subscriber;
|
|
|
|
+ struct tipc_subscriber *subscriber_temp;
|
|
spinlock_t *subscriber_lock;
|
|
spinlock_t *subscriber_lock;
|
|
|
|
|
|
if (topsrv.setup_port) {
|
|
if (topsrv.setup_port) {
|