aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/bcast.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc/bcast.c')
-rw-r--r--net/tipc/bcast.c22
1 files changed, 0 insertions, 22 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index e00441a2092..2625f5ebe3e 100644
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -73,7 +73,6 @@ struct tipc_bcbearer_pair {
73 * large local variables within multicast routines. Concurrent access is 73 * large local variables within multicast routines. Concurrent access is
74 * prevented through use of the spinlock "bc_lock". 74 * prevented through use of the spinlock "bc_lock".
75 */ 75 */
76
77struct tipc_bcbearer { 76struct tipc_bcbearer {
78 struct tipc_bearer bearer; 77 struct tipc_bearer bearer;
79 struct tipc_media media; 78 struct tipc_media media;
@@ -92,7 +91,6 @@ struct tipc_bcbearer {
92 * 91 *
93 * Handles sequence numbering, fragmentation, bundling, etc. 92 * Handles sequence numbering, fragmentation, bundling, etc.
94 */ 93 */
95
96struct tipc_bclink { 94struct tipc_bclink {
97 struct tipc_link link; 95 struct tipc_link link;
98 struct tipc_node node; 96 struct tipc_node node;
@@ -169,7 +167,6 @@ static void bclink_update_last_sent(struct tipc_node *node, u32 seqno)
169 * 167 *
170 * Called with bc_lock locked 168 * Called with bc_lock locked
171 */ 169 */
172
173struct tipc_node *tipc_bclink_retransmit_to(void) 170struct tipc_node *tipc_bclink_retransmit_to(void)
174{ 171{
175 return bclink->retransmit_to; 172 return bclink->retransmit_to;
@@ -182,7 +179,6 @@ struct tipc_node *tipc_bclink_retransmit_to(void)
182 * 179 *
183 * Called with bc_lock locked 180 * Called with bc_lock locked
184 */ 181 */
185
186static void bclink_retransmit_pkt(u32 after, u32 to) 182static void bclink_retransmit_pkt(u32 after, u32 to)
187{ 183{
188 struct sk_buff *buf; 184 struct sk_buff *buf;
@@ -200,7 +196,6 @@ static void bclink_retransmit_pkt(u32 after, u32 to)
200 * 196 *
201 * Node is locked, bc_lock unlocked. 197 * Node is locked, bc_lock unlocked.
202 */ 198 */
203
204void tipc_bclink_acknowledge(struct tipc_node *n_ptr, u32 acked) 199void tipc_bclink_acknowledge(struct tipc_node *n_ptr, u32 acked)
205{ 200{
206 struct sk_buff *crs; 201 struct sk_buff *crs;
@@ -280,7 +275,6 @@ exit:
280 * 275 *
281 * tipc_net_lock and node lock set 276 * tipc_net_lock and node lock set
282 */ 277 */
283
284void tipc_bclink_update_link_state(struct tipc_node *n_ptr, u32 last_sent) 278void tipc_bclink_update_link_state(struct tipc_node *n_ptr, u32 last_sent)
285{ 279{
286 struct sk_buff *buf; 280 struct sk_buff *buf;
@@ -344,7 +338,6 @@ void tipc_bclink_update_link_state(struct tipc_node *n_ptr, u32 last_sent)
344 * 338 *
345 * Only tipc_net_lock set. 339 * Only tipc_net_lock set.
346 */ 340 */
347
348static void bclink_peek_nack(struct tipc_msg *msg) 341static void bclink_peek_nack(struct tipc_msg *msg)
349{ 342{
350 struct tipc_node *n_ptr = tipc_node_find(msg_destnode(msg)); 343 struct tipc_node *n_ptr = tipc_node_find(msg_destnode(msg));
@@ -365,7 +358,6 @@ static void bclink_peek_nack(struct tipc_msg *msg)
365/* 358/*
366 * tipc_bclink_send_msg - broadcast a packet to all nodes in cluster 359 * tipc_bclink_send_msg - broadcast a packet to all nodes in cluster
367 */ 360 */
368
369int tipc_bclink_send_msg(struct sk_buff *buf) 361int tipc_bclink_send_msg(struct sk_buff *buf)
370{ 362{
371 int res; 363 int res;
@@ -394,7 +386,6 @@ exit:
394 * 386 *
395 * Called with both sending node's lock and bc_lock taken. 387 * Called with both sending node's lock and bc_lock taken.
396 */ 388 */
397
398static void bclink_accept_pkt(struct tipc_node *node, u32 seqno) 389static void bclink_accept_pkt(struct tipc_node *node, u32 seqno)
399{ 390{
400 bclink_update_last_sent(node, seqno); 391 bclink_update_last_sent(node, seqno);
@@ -420,7 +411,6 @@ static void bclink_accept_pkt(struct tipc_node *node, u32 seqno)
420 * 411 *
421 * tipc_net_lock is read_locked, no other locks set 412 * tipc_net_lock is read_locked, no other locks set
422 */ 413 */
423
424void tipc_bclink_recv_pkt(struct sk_buff *buf) 414void tipc_bclink_recv_pkt(struct sk_buff *buf)
425{ 415{
426 struct tipc_msg *msg = buf_msg(buf); 416 struct tipc_msg *msg = buf_msg(buf);
@@ -588,7 +578,6 @@ u32 tipc_bclink_acks_missing(struct tipc_node *n_ptr)
588 * Returns 0 (packet sent successfully) under all circumstances, 578 * Returns 0 (packet sent successfully) under all circumstances,
589 * since the broadcast link's pseudo-bearer never blocks 579 * since the broadcast link's pseudo-bearer never blocks
590 */ 580 */
591
592static int tipc_bcbearer_send(struct sk_buff *buf, 581static int tipc_bcbearer_send(struct sk_buff *buf,
593 struct tipc_bearer *unused1, 582 struct tipc_bearer *unused1,
594 struct tipc_media_addr *unused2) 583 struct tipc_media_addr *unused2)
@@ -601,7 +590,6 @@ static int tipc_bcbearer_send(struct sk_buff *buf,
601 * preparation is skipped for broadcast link protocol messages 590 * preparation is skipped for broadcast link protocol messages
602 * since they are sent in an unreliable manner and don't need it 591 * since they are sent in an unreliable manner and don't need it
603 */ 592 */
604
605 if (likely(!msg_non_seq(buf_msg(buf)))) { 593 if (likely(!msg_non_seq(buf_msg(buf)))) {
606 struct tipc_msg *msg; 594 struct tipc_msg *msg;
607 595
@@ -618,7 +606,6 @@ static int tipc_bcbearer_send(struct sk_buff *buf,
618 } 606 }
619 607
620 /* Send buffer over bearers until all targets reached */ 608 /* Send buffer over bearers until all targets reached */
621
622 bcbearer->remains = bclink->bcast_nodes; 609 bcbearer->remains = bclink->bcast_nodes;
623 610
624 for (bp_index = 0; bp_index < MAX_BEARERS; bp_index++) { 611 for (bp_index = 0; bp_index < MAX_BEARERS; bp_index++) {
@@ -660,7 +647,6 @@ static int tipc_bcbearer_send(struct sk_buff *buf,
660/** 647/**
661 * tipc_bcbearer_sort - create sets of bearer pairs used by broadcast bearer 648 * tipc_bcbearer_sort - create sets of bearer pairs used by broadcast bearer
662 */ 649 */
663
664void tipc_bcbearer_sort(void) 650void tipc_bcbearer_sort(void)
665{ 651{
666 struct tipc_bcbearer_pair *bp_temp = bcbearer->bpairs_temp; 652 struct tipc_bcbearer_pair *bp_temp = bcbearer->bpairs_temp;
@@ -671,7 +657,6 @@ void tipc_bcbearer_sort(void)
671 spin_lock_bh(&bc_lock); 657 spin_lock_bh(&bc_lock);
672 658
673 /* Group bearers by priority (can assume max of two per priority) */ 659 /* Group bearers by priority (can assume max of two per priority) */
674
675 memset(bp_temp, 0, sizeof(bcbearer->bpairs_temp)); 660 memset(bp_temp, 0, sizeof(bcbearer->bpairs_temp));
676 661
677 for (b_index = 0; b_index < MAX_BEARERS; b_index++) { 662 for (b_index = 0; b_index < MAX_BEARERS; b_index++) {
@@ -687,7 +672,6 @@ void tipc_bcbearer_sort(void)
687 } 672 }
688 673
689 /* Create array of bearer pairs for broadcasting */ 674 /* Create array of bearer pairs for broadcasting */
690
691 bp_curr = bcbearer->bpairs; 675 bp_curr = bcbearer->bpairs;
692 memset(bcbearer->bpairs, 0, sizeof(bcbearer->bpairs)); 676 memset(bcbearer->bpairs, 0, sizeof(bcbearer->bpairs));
693 677
@@ -817,7 +801,6 @@ void tipc_bclink_stop(void)
817/** 801/**
818 * tipc_nmap_add - add a node to a node map 802 * tipc_nmap_add - add a node to a node map
819 */ 803 */
820
821void tipc_nmap_add(struct tipc_node_map *nm_ptr, u32 node) 804void tipc_nmap_add(struct tipc_node_map *nm_ptr, u32 node)
822{ 805{
823 int n = tipc_node(node); 806 int n = tipc_node(node);
@@ -833,7 +816,6 @@ void tipc_nmap_add(struct tipc_node_map *nm_ptr, u32 node)
833/** 816/**
834 * tipc_nmap_remove - remove a node from a node map 817 * tipc_nmap_remove - remove a node from a node map
835 */ 818 */
836
837void tipc_nmap_remove(struct tipc_node_map *nm_ptr, u32 node) 819void tipc_nmap_remove(struct tipc_node_map *nm_ptr, u32 node)
838{ 820{
839 int n = tipc_node(node); 821 int n = tipc_node(node);
@@ -852,7 +834,6 @@ void tipc_nmap_remove(struct tipc_node_map *nm_ptr, u32 node)
852 * @nm_b: input node map B 834 * @nm_b: input node map B
853 * @nm_diff: output node map A-B (i.e. nodes of A that are not in B) 835 * @nm_diff: output node map A-B (i.e. nodes of A that are not in B)
854 */ 836 */
855
856static void tipc_nmap_diff(struct tipc_node_map *nm_a, 837static void tipc_nmap_diff(struct tipc_node_map *nm_a,
857 struct tipc_node_map *nm_b, 838 struct tipc_node_map *nm_b,
858 struct tipc_node_map *nm_diff) 839 struct tipc_node_map *nm_diff)
@@ -878,7 +859,6 @@ static void tipc_nmap_diff(struct tipc_node_map *nm_a,
878/** 859/**
879 * tipc_port_list_add - add a port to a port list, ensuring no duplicates 860 * tipc_port_list_add - add a port to a port list, ensuring no duplicates
880 */ 861 */
881
882void tipc_port_list_add(struct tipc_port_list *pl_ptr, u32 port) 862void tipc_port_list_add(struct tipc_port_list *pl_ptr, u32 port)
883{ 863{
884 struct tipc_port_list *item = pl_ptr; 864 struct tipc_port_list *item = pl_ptr;
@@ -912,7 +892,6 @@ void tipc_port_list_add(struct tipc_port_list *pl_ptr, u32 port)
912 * tipc_port_list_free - free dynamically created entries in port_list chain 892 * tipc_port_list_free - free dynamically created entries in port_list chain
913 * 893 *
914 */ 894 */
915
916void tipc_port_list_free(struct tipc_port_list *pl_ptr) 895void tipc_port_list_free(struct tipc_port_list *pl_ptr)
917{ 896{
918 struct tipc_port_list *item; 897 struct tipc_port_list *item;
@@ -923,4 +902,3 @@ void tipc_port_list_free(struct tipc_port_list *pl_ptr)
923 kfree(item); 902 kfree(item);
924 } 903 }
925} 904}
926