tipc: rename struct port_list to struct tipc_port_list

Make this rename so that it is consistent with the majority
of the other tipc structs and to assist in removing any
ambiguity with other similar names in other subsystems.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index b6afe7356a86659c99310151b6ef7856a5ee726f..653be792b10279ddff752d1c94711911b669c28b 100644 (file)
--- 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 port_list *next;
+       struct tipc_port_list *item;
+       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 3c37fdb8a0a633f7e2d15e63ac34f54e967887a5..b009666c60b0e5464ac1bdaaab031289fd8b7597 100644 (file)
--- 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_free(struct port_list *pl_ptr);
+void tipc_port_list_add(struct tipc_port_list *pl_ptr, u32 port);
+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 46e6b6c2ecc9fe3e78e662d1506ce545a126d028..f0abae93c1f1c666f80297178d737f7784067c9e 100644 (file)
--- 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 62d77e5e902e3de5df72c88630e1d9b3b1ebc5f1..c3b0f2c3dbbebf7202a86f30229ec140d0ab6e7b 100644 (file)
--- 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 54d812a5a4d9dd272f330dcaa310c09d7499e29a..d91efc69e6f9b776868798b220e301f279e3eaf6 100644 (file)
--- 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 port_list *item = dp;
+       struct tipc_port_list dports = {0, NULL, };
+       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 b9aa34195aecd4d447daa1b46911ab83e887d6c3..f751807e2a913534246289610d5e3a07fd0a710d 100644 (file)
--- 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);
 
 /**