Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-29 06:12:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

tipc: rename struct port_list to struct tipc_port_list

Browse Source 
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>
This commit is contained in:
Paul Gortmaker 2011-12-29 20:33:30 -05:00
parent 358a0d1c9e
commit 4584310b4a
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/tipc/bcast.c
View File

@ -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 * 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 i;
int item_sz = PLSIZE; int item_sz = PLSIZE;
int cnt = pl_ptr->count; 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) { for (item = pl_ptr->next; item; item = next) {
next = item->next; next = item->next;

10
net/tipc/bcast.h
View File

@ -54,15 +54,15 @@ struct tipc_node_map {
#define PLSIZE 32 #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) * @count: # of ports in set (only valid for first entry in list)
* @next: pointer to next entry in list * @next: pointer to next entry in list
* @ports: array of port references * @ports: array of port references
*/ */
struct port_list { struct tipc_port_list {
int count; int count;
struct port_list *next; struct tipc_port_list *next;
u32 ports[PLSIZE]; 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)); 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_init(void);
void tipc_bclink_stop(void); void tipc_bclink_stop(void);

2
net/tipc/name_table.c
View File

@ -625,7 +625,7 @@ not_found:
*/ */
int tipc_nametbl_mc_translate(u32 type, u32 lower, u32 upper, u32 limit, 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 name_seq *seq;
struct sub_seq *sseq; struct sub_seq *sseq;

4
net/tipc/name_table.h
View File

@ -40,7 +40,7 @@
#include "node_subscr.h" #include "node_subscr.h"
struct subscription; struct subscription;
struct port_list; struct tipc_port_list;
/* /*
* TIPC name types reserved for internal TIPC use (both current and planned) * 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); 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); u32 tipc_nametbl_translate(u32 type, u32 instance, u32 *node);
int tipc_nametbl_mc_translate(u32 type, u32 lower, u32 upper, u32 limit, 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, int tipc_nametbl_publish_rsv(u32 ref, unsigned int scope,
struct tipc_name_seq const *seq); struct tipc_name_seq const *seq);
struct publication *tipc_nametbl_publish(u32 type, u32 lower, u32 upper, struct publication *tipc_nametbl_publish(u32 type, u32 lower, u32 upper,

8
net/tipc/port.c
View File

@ -80,7 +80,7 @@ int tipc_multicast(u32 ref, struct tipc_name_seq const *seq,
struct tipc_msg *hdr; struct tipc_msg *hdr;
struct sk_buff *buf; struct sk_buff *buf;
struct sk_buff *ibuf = NULL; 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); struct tipc_port *oport = tipc_port_deref(ref);
int ext_targets; int ext_targets;
int res; 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 * 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 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; int cnt = 0;
msg = buf_msg(buf); msg = buf_msg(buf);

4
net/tipc/port.h
View File

@ -151,7 +151,7 @@ struct tipc_port {
}; };
extern spinlock_t tipc_port_list_lock; extern spinlock_t tipc_port_list_lock;
struct port_list; struct tipc_port_list;
/* /*
* TIPC port manipulation routines * 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); unsigned int total_len, int err);
struct sk_buff *tipc_port_get_ports(void); struct sk_buff *tipc_port_get_ports(void);
void tipc_port_recv_proto_msg(struct sk_buff *buf); 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); void tipc_port_reinit(void);
/** /**