aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/bcast.c
diff options
context:
space:
mode:
authorAllan Stephens <Allan.Stephens@windriver.com>2010-12-31 13:59:27 -0500
committerDavid S. Miller <davem@davemloft.net>2011-01-01 16:57:53 -0500
commit8d64a5ba58157dedc61f3f1f51e1c5d66f32a484 (patch)
tree2bfd8a02b5da343cd24eafb95197a426aa94dd45 /net/tipc/bcast.c
parent7ced6890bf81d311ab2ea846f92d5f3d0951c08c (diff)
tipc: Prune down link-specific debugging code
Eliminates most link-specific debugging code in TIPC, which is now largely unnecessary. All calls to the link-specific debugging macros have been removed, as are the macros themselves; in addition, the optional allocation of print buffers to hold debugging information for each link endpoint has been removed. The ability for TIPC to print out helpful diagnostic information when link retransmit failures occur has been retained for the time being, as an aid in tracking down the cause of such failures. Signed-off-by: Allan Stephens <Allan.Stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/bcast.c')
-rw-r--r--net/tipc/bcast.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/net/tipc/bcast.c b/net/tipc/bcast.c
index cb817d503c14..22a10fadc8c6 100644
--- a/net/tipc/bcast.c
+++ b/net/tipc/bcast.c
@@ -45,8 +45,6 @@
45 45
46#define BCLINK_WIN_DEFAULT 20 /* bcast link window size (default) */ 46#define BCLINK_WIN_DEFAULT 20 /* bcast link window size (default) */
47 47
48#define BCLINK_LOG_BUF_SIZE 0
49
50/* 48/*
51 * Loss rate for incoming broadcast frames; used to test retransmission code. 49 * Loss rate for incoming broadcast frames; used to test retransmission code.
52 * Set to N to cause every N'th frame to be discarded; 0 => don't discard any. 50 * Set to N to cause every N'th frame to be discarded; 0 => don't discard any.
@@ -774,7 +772,6 @@ int tipc_bclink_init(void)
774 bcbearer = kzalloc(sizeof(*bcbearer), GFP_ATOMIC); 772 bcbearer = kzalloc(sizeof(*bcbearer), GFP_ATOMIC);
775 bclink = kzalloc(sizeof(*bclink), GFP_ATOMIC); 773 bclink = kzalloc(sizeof(*bclink), GFP_ATOMIC);
776 if (!bcbearer || !bclink) { 774 if (!bcbearer || !bclink) {
777 nomem:
778 warn("Multicast link creation failed, no memory\n"); 775 warn("Multicast link creation failed, no memory\n");
779 kfree(bcbearer); 776 kfree(bcbearer);
780 bcbearer = NULL; 777 bcbearer = NULL;
@@ -799,14 +796,6 @@ int tipc_bclink_init(void)
799 bcl->state = WORKING_WORKING; 796 bcl->state = WORKING_WORKING;
800 strlcpy(bcl->name, tipc_bclink_name, TIPC_MAX_LINK_NAME); 797 strlcpy(bcl->name, tipc_bclink_name, TIPC_MAX_LINK_NAME);
801 798
802 if (BCLINK_LOG_BUF_SIZE) {
803 char *pb = kmalloc(BCLINK_LOG_BUF_SIZE, GFP_ATOMIC);
804
805 if (!pb)
806 goto nomem;
807 tipc_printbuf_init(&bcl->print_buf, pb, BCLINK_LOG_BUF_SIZE);
808 }
809
810 return 0; 799 return 0;
811} 800}
812 801
@@ -815,8 +804,6 @@ void tipc_bclink_stop(void)
815 spin_lock_bh(&bc_lock); 804 spin_lock_bh(&bc_lock);
816 if (bcbearer) { 805 if (bcbearer) {
817 tipc_link_stop(bcl); 806 tipc_link_stop(bcl);
818 if (BCLINK_LOG_BUF_SIZE)
819 kfree(bcl->print_buf.buf);
820 bcl = NULL; 807 bcl = NULL;
821 kfree(bclink); 808 kfree(bclink);
822 bclink = NULL; 809 bclink = NULL;