6 files changed, 19 insertions, 19 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index b6afe7356a86..653be792b102 100644
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -893,9 +893,9 @@ static void tipc_nmap_diff(struct tipc_node_map *nm_a,
 * tipc_port_list_add - add a port to a port list, ensuring no duplicates
 */
-void tipc_port_list_add(struct port_list *pl_ptr, u32 port)
+void tipc_port_list_add(struct tipc_port_list *pl_ptr, u32 port)
 {
-        struct port_list *item = pl_ptr;
+        struct tipc_port_list *item = pl_ptr;
        int i;
        int item_sz = PLSIZE;
        int cnt = pl_ptr->count;
@@ -927,10 +927,10 @@ void tipc_port_list_add(struct port_list *pl_ptr, u32 port)
 *
 */
-void tipc_port_list_free(struct port_list *pl_ptr)
+void tipc_port_list_free(struct tipc_port_list *pl_ptr)
 {
-        struct port_list *item;
+        struct tipc_port_list *item;
-        struct port_list *next;
+        struct tipc_port_list *next;
        for (item = pl_ptr->next; item; item = next) {
                next = item->next;
diff --git a/net/tipc/bcast.h b/net/tipc/bcast.h
index 3c37fdb8a0a6..b009666c60b0 100644
--- a/net/tipc/bcast.h
+++ b/net/tipc/bcast.h
@@ -54,15 +54,15 @@ struct tipc_node_map {
 #define PLSIZE 32
 /**
- * struct port_list - set of node local destination ports
+ * struct tipc_port_list - set of node local destination ports
 * @count: # of ports in set (only valid for first entry in list)
 * @next: pointer to next entry in list
 * @ports: array of port references
 */
-struct port_list {
+struct tipc_port_list {
        int count;
-        struct port_list *next;
+        struct tipc_port_list *next;
        u32 ports[PLSIZE];
 };
@@ -83,8 +83,8 @@ static inline int tipc_nmap_equal(struct tipc_node_map *nm_a, struct tipc_node_m
        return !memcmp(nm_a, nm_b, sizeof(*nm_a));
 }
-void tipc_port_list_add(struct port_list *pl_ptr, u32 port);
+void tipc_port_list_add(struct tipc_port_list *pl_ptr, u32 port);
-void tipc_port_list_free(struct port_list *pl_ptr);
+void tipc_port_list_free(struct tipc_port_list *pl_ptr);
 void tipc_bclink_init(void);
 void tipc_bclink_stop(void);
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index 46e6b6c2ecc9..f0abae93c1f1 100644
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -625,7 +625,7 @@ not_found:
 */
 int tipc_nametbl_mc_translate(u32 type, u32 lower, u32 upper, u32 limit,
-                              struct port_list *dports)
+                              struct tipc_port_list *dports)
 {
        struct name_seq *seq;
        struct sub_seq *sseq;
diff --git a/net/tipc/name_table.h b/net/tipc/name_table.h
index 62d77e5e902e..c3b0f2c3dbbe 100644
--- a/net/tipc/name_table.h
+++ b/net/tipc/name_table.h
@@ -40,7 +40,7 @@
 #include "node_subscr.h"
 struct subscription;
-struct port_list;
+struct tipc_port_list;
 /*
 * TIPC name types reserved for internal TIPC use (both current and planned)
@@ -90,7 +90,7 @@ extern rwlock_t tipc_nametbl_lock;
 struct sk_buff *tipc_nametbl_get(const void *req_tlv_area, int req_tlv_space);
 u32 tipc_nametbl_translate(u32 type, u32 instance, u32 *node);
 int tipc_nametbl_mc_translate(u32 type, u32 lower, u32 upper, u32 limit,
-                         struct port_list *dports);
+                         struct tipc_port_list *dports);
 int tipc_nametbl_publish_rsv(u32 ref, unsigned int scope,
                        struct tipc_name_seq const *seq);
 struct publication *tipc_nametbl_publish(u32 type, u32 lower, u32 upper,
diff --git a/net/tipc/port.c b/net/tipc/port.c
index 54d812a5a4d9..d91efc69e6f9 100644
--- a/net/tipc/port.c
+++ b/net/tipc/port.c
@@ -80,7 +80,7 @@ int tipc_multicast(u32 ref, struct tipc_name_seq const *seq,
        struct tipc_msg *hdr;
        struct sk_buff *buf;
        struct sk_buff *ibuf = NULL;
-        struct port_list dports = {0, NULL, };
+        struct tipc_port_list dports = {0, NULL, };
        struct tipc_port *oport = tipc_port_deref(ref);
        int ext_targets;
        int res;
@@ -142,11 +142,11 @@ int tipc_multicast(u32 ref, struct tipc_name_seq const *seq,
 * If there is no port list, perform a lookup to create one
 */
-void tipc_port_recv_mcast(struct sk_buff *buf, struct port_list *dp)
+void tipc_port_recv_mcast(struct sk_buff *buf, struct tipc_port_list *dp)
 {
        struct tipc_msg *msg;
-        struct port_list dports = {0, NULL, };
+        struct tipc_port_list dports = {0, NULL, };
-        struct port_list *item = dp;
+        struct tipc_port_list *item = dp;
        int cnt = 0;
        msg = buf_msg(buf);
diff --git a/net/tipc/port.h b/net/tipc/port.h
index b9aa34195aec..f751807e2a91 100644
--- a/net/tipc/port.h
+++ b/net/tipc/port.h
@@ -151,7 +151,7 @@ struct tipc_port {
 };
 extern spinlock_t tipc_port_list_lock;
-struct port_list;
+struct tipc_port_list;
 /*
 * TIPC port manipulation routines
@@ -228,7 +228,7 @@ int tipc_port_reject_sections(struct tipc_port *p_ptr, struct tipc_msg *hdr,
                              unsigned int total_len, int err);
 struct sk_buff *tipc_port_get_ports(void);
 void tipc_port_recv_proto_msg(struct sk_buff *buf);
-void tipc_port_recv_mcast(struct sk_buff *buf, struct port_list *dp);
+void tipc_port_recv_mcast(struct sk_buff *buf, struct tipc_port_list *dp);
 void tipc_port_reinit(void);
 /**

diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c index b6afe7356a86..653be792b102 100644 --- a/net/tipc/bcast.c +++ b/net/tipc/bcast.c
@@ -893,9 +893,9 @@ static void tipc_nmap_diff(struct tipc_node_map *nm_a,
893	* tipc_port_list_add - add a port to a port list, ensuring no duplicates	893	* tipc_port_list_add - add a port to a port list, ensuring no duplicates
894	*/	894	*/
895		895
896	void tipc_port_list_add(struct port_list *pl_ptr, u32 port)	896	void tipc_port_list_add(struct tipc_port_list *pl_ptr, u32 port)
897	{	897	{
898	struct port_list *item = pl_ptr;	898	struct tipc_port_list *item = pl_ptr;
899	int i;	899	int i;
900	int item_sz = PLSIZE;	900	int item_sz = PLSIZE;
901	int cnt = pl_ptr->count;	901	int cnt = pl_ptr->count;
@@ -927,10 +927,10 @@ void tipc_port_list_add(struct port_list *pl_ptr, u32 port)
927	*	927	*
928	*/	928	*/
929		929
930	void tipc_port_list_free(struct port_list *pl_ptr)	930	void tipc_port_list_free(struct tipc_port_list *pl_ptr)
931	{	931	{
932	struct port_list *item;	932	struct tipc_port_list *item;
933	struct port_list *next;	933	struct tipc_port_list *next;
934		934
935	for (item = pl_ptr->next; item; item = next) {	935	for (item = pl_ptr->next; item; item = next) {
936	next = item->next;	936	next = item->next;


diff --git a/net/tipc/bcast.h b/net/tipc/bcast.h index 3c37fdb8a0a6..b009666c60b0 100644 --- a/net/tipc/bcast.h +++ b/net/tipc/bcast.h
@@ -54,15 +54,15 @@ struct tipc_node_map {
54	#define PLSIZE 32	54	#define PLSIZE 32
55		55
56	/**	56	/**
57	* struct port_list - set of node local destination ports	57	* struct tipc_port_list - set of node local destination ports
58	* @count: # of ports in set (only valid for first entry in list)	58	* @count: # of ports in set (only valid for first entry in list)
59	* @next: pointer to next entry in list	59	* @next: pointer to next entry in list
60	* @ports: array of port references	60	* @ports: array of port references
61	*/	61	*/
62		62
63	struct port_list {	63	struct tipc_port_list {
64	int count;	64	int count;
65	struct port_list *next;	65	struct tipc_port_list *next;
66	u32 ports[PLSIZE];	66	u32 ports[PLSIZE];
67	};	67	};
68		68
@@ -83,8 +83,8 @@ static inline int tipc_nmap_equal(struct tipc_node_map *nm_a, struct tipc_node_m
83	return !memcmp(nm_a, nm_b, sizeof(*nm_a));	83	return !memcmp(nm_a, nm_b, sizeof(*nm_a));
84	}	84	}
85		85
86	void tipc_port_list_add(struct port_list *pl_ptr, u32 port);	86	void tipc_port_list_add(struct tipc_port_list *pl_ptr, u32 port);
87	void tipc_port_list_free(struct port_list *pl_ptr);	87	void tipc_port_list_free(struct tipc_port_list *pl_ptr);
88		88
89	void tipc_bclink_init(void);	89	void tipc_bclink_init(void);
90	void tipc_bclink_stop(void);	90	void tipc_bclink_stop(void);


diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c index 46e6b6c2ecc9..f0abae93c1f1 100644 --- a/net/tipc/name_table.c +++ b/net/tipc/name_table.c
@@ -625,7 +625,7 @@ not_found:
625	*/	625	*/
626		626
627	int tipc_nametbl_mc_translate(u32 type, u32 lower, u32 upper, u32 limit,	627	int tipc_nametbl_mc_translate(u32 type, u32 lower, u32 upper, u32 limit,
628	struct port_list *dports)	628	struct tipc_port_list *dports)
629	{	629	{
630	struct name_seq *seq;	630	struct name_seq *seq;
631	struct sub_seq *sseq;	631	struct sub_seq *sseq;


diff --git a/net/tipc/name_table.h b/net/tipc/name_table.h index 62d77e5e902e..c3b0f2c3dbbe 100644 --- a/net/tipc/name_table.h +++ b/net/tipc/name_table.h
@@ -40,7 +40,7 @@
40	#include "node_subscr.h"	40	#include "node_subscr.h"
41		41
42	struct subscription;	42	struct subscription;
43	struct port_list;	43	struct tipc_port_list;
44		44
45	/*	45	/*
46	* TIPC name types reserved for internal TIPC use (both current and planned)	46	* TIPC name types reserved for internal TIPC use (both current and planned)
@@ -90,7 +90,7 @@ extern rwlock_t tipc_nametbl_lock;
90	struct sk_buff tipc_nametbl_get(const void req_tlv_area, int req_tlv_space);	90	struct sk_buff tipc_nametbl_get(const void req_tlv_area, int req_tlv_space);
91	u32 tipc_nametbl_translate(u32 type, u32 instance, u32 *node);	91	u32 tipc_nametbl_translate(u32 type, u32 instance, u32 *node);
92	int tipc_nametbl_mc_translate(u32 type, u32 lower, u32 upper, u32 limit,	92	int tipc_nametbl_mc_translate(u32 type, u32 lower, u32 upper, u32 limit,
93	struct port_list *dports);	93	struct tipc_port_list *dports);
94	int tipc_nametbl_publish_rsv(u32 ref, unsigned int scope,	94	int tipc_nametbl_publish_rsv(u32 ref, unsigned int scope,
95	struct tipc_name_seq const *seq);	95	struct tipc_name_seq const *seq);
96	struct publication *tipc_nametbl_publish(u32 type, u32 lower, u32 upper,	96	struct publication *tipc_nametbl_publish(u32 type, u32 lower, u32 upper,


diff --git a/net/tipc/port.c b/net/tipc/port.c index 54d812a5a4d9..d91efc69e6f9 100644 --- a/net/tipc/port.c +++ b/net/tipc/port.c
@@ -80,7 +80,7 @@ int tipc_multicast(u32 ref, struct tipc_name_seq const *seq,
80	struct tipc_msg *hdr;	80	struct tipc_msg *hdr;
81	struct sk_buff *buf;	81	struct sk_buff *buf;
82	struct sk_buff *ibuf = NULL;	82	struct sk_buff *ibuf = NULL;
83	struct port_list dports = {0, NULL, };	83	struct tipc_port_list dports = {0, NULL, };
84	struct tipc_port *oport = tipc_port_deref(ref);	84	struct tipc_port *oport = tipc_port_deref(ref);
85	int ext_targets;	85	int ext_targets;
86	int res;	86	int res;
@@ -142,11 +142,11 @@ int tipc_multicast(u32 ref, struct tipc_name_seq const *seq,
142	* If there is no port list, perform a lookup to create one	142	* If there is no port list, perform a lookup to create one
143	*/	143	*/
144		144
145	void tipc_port_recv_mcast(struct sk_buff buf, struct port_list dp)	145	void tipc_port_recv_mcast(struct sk_buff buf, struct tipc_port_list dp)
146	{	146	{
147	struct tipc_msg *msg;	147	struct tipc_msg *msg;
148	struct port_list dports = {0, NULL, };	148	struct tipc_port_list dports = {0, NULL, };
149	struct port_list *item = dp;	149	struct tipc_port_list *item = dp;
150	int cnt = 0;	150	int cnt = 0;
151		151
152	msg = buf_msg(buf);	152	msg = buf_msg(buf);


diff --git a/net/tipc/port.h b/net/tipc/port.h index b9aa34195aec..f751807e2a91 100644 --- a/net/tipc/port.h +++ b/net/tipc/port.h
@@ -151,7 +151,7 @@ struct tipc_port {
151	};	151	};
152		152
153	extern spinlock_t tipc_port_list_lock;	153	extern spinlock_t tipc_port_list_lock;
154	struct port_list;	154	struct tipc_port_list;
155		155
156	/*	156	/*
157	* TIPC port manipulation routines	157	* TIPC port manipulation routines
@@ -228,7 +228,7 @@ int tipc_port_reject_sections(struct tipc_port p_ptr, struct tipc_msg hdr,
228	unsigned int total_len, int err);	228	unsigned int total_len, int err);
229	struct sk_buff *tipc_port_get_ports(void);	229	struct sk_buff *tipc_port_get_ports(void);
230	void tipc_port_recv_proto_msg(struct sk_buff *buf);	230	void tipc_port_recv_proto_msg(struct sk_buff *buf);
231	void tipc_port_recv_mcast(struct sk_buff buf, struct port_list dp);	231	void tipc_port_recv_mcast(struct sk_buff buf, struct tipc_port_list dp);
232	void tipc_port_reinit(void);	232	void tipc_port_reinit(void);
233		233
234	/**	234	/**