4040#include "subscr.h"
4141
4242/**
43- * struct subscriber - TIPC network topology subscriber
43+ * struct tipc_subscriber - TIPC network topology subscriber
4444 * @port_ref: object reference to server port connecting to subscriber
4545 * @lock: pointer to spinlock controlling access to subscriber's server port
4646 * @subscriber_list: adjacent subscribers in top. server's list of subscribers
4747 * @subscription_list: list of subscription objects for this subscriber
4848 */
4949
50- struct subscriber {
50+ struct tipc_subscriber {
5151 u32 port_ref ;
5252 spinlock_t * lock ;
5353 struct list_head subscriber_list ;
@@ -224,7 +224,7 @@ static void subscr_del(struct tipc_subscription *sub)
224224 * simply wait for it to be released, then claim it.)
225225 */
226226
227- static void subscr_terminate (struct subscriber * subscriber )
227+ static void subscr_terminate (struct tipc_subscriber * subscriber )
228228{
229229 u32 port_ref ;
230230 struct tipc_subscription * sub ;
@@ -278,7 +278,7 @@ static void subscr_terminate(struct subscriber *subscriber)
278278 */
279279
280280static void subscr_cancel (struct tipc_subscr * s ,
281- struct subscriber * subscriber )
281+ struct tipc_subscriber * subscriber )
282282{
283283 struct tipc_subscription * sub ;
284284 struct tipc_subscription * sub_temp ;
@@ -315,7 +315,7 @@ static void subscr_cancel(struct tipc_subscr *s,
315315 */
316316
317317static struct tipc_subscription * subscr_subscribe (struct tipc_subscr * s ,
318- struct subscriber * subscriber )
318+ struct tipc_subscriber * subscriber )
319319{
320320 struct tipc_subscription * sub ;
321321 int swap ;
@@ -393,7 +393,7 @@ static void subscr_conn_shutdown_event(void *usr_handle,
393393 unsigned int size ,
394394 int reason )
395395{
396- struct subscriber * subscriber = usr_handle ;
396+ struct tipc_subscriber * subscriber = usr_handle ;
397397 spinlock_t * subscriber_lock ;
398398
399399 if (tipc_port_lock (port_ref ) == NULL )
@@ -416,7 +416,7 @@ static void subscr_conn_msg_event(void *usr_handle,
416416 const unchar * data ,
417417 u32 size )
418418{
419- struct subscriber * subscriber = usr_handle ;
419+ struct tipc_subscriber * subscriber = usr_handle ;
420420 spinlock_t * subscriber_lock ;
421421 struct tipc_subscription * sub ;
422422
@@ -471,12 +471,12 @@ static void subscr_named_msg_event(void *usr_handle,
471471 struct tipc_portid const * orig ,
472472 struct tipc_name_seq const * dest )
473473{
474- struct subscriber * subscriber ;
474+ struct tipc_subscriber * subscriber ;
475475 u32 server_port_ref ;
476476
477477 /* Create subscriber object */
478478
479- subscriber = kzalloc (sizeof (struct subscriber ), GFP_ATOMIC );
479+ subscriber = kzalloc (sizeof (struct tipc_subscriber ), GFP_ATOMIC );
480480 if (subscriber == NULL ) {
481481 warn ("Subscriber rejected, no memory\n" );
482482 return ;
@@ -568,8 +568,8 @@ int tipc_subscr_start(void)
568568
569569void tipc_subscr_stop (void )
570570{
571- struct subscriber * subscriber ;
572- struct subscriber * subscriber_temp ;
571+ struct tipc_subscriber * subscriber ;
572+ struct tipc_subscriber * subscriber_temp ;
573573 spinlock_t * subscriber_lock ;
574574
575575 if (topsrv .setup_port ) {
0 commit comments