Commit b29f1428 authored by Allan Stephens's avatar Allan Stephens Committed by David S. Miller

tipc: remove calls to dbg() and msg_dbg()

Eliminates obsolete calls to two of TIPC's main debugging macros, as well
as a pair of associated debugging routines that are no longer required.
Signed-off-by: default avatarAllan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f5e75269
...@@ -436,8 +436,6 @@ void tipc_bclink_recv_pkt(struct sk_buff *buf) ...@@ -436,8 +436,6 @@ void tipc_bclink_recv_pkt(struct sk_buff *buf)
u32 seqno; u32 seqno;
struct sk_buff *deferred; struct sk_buff *deferred;
msg_dbg(msg, "<BC<<<");
if (unlikely(!node || !tipc_node_is_up(node) || !node->bclink.supported || if (unlikely(!node || !tipc_node_is_up(node) || !node->bclink.supported ||
(msg_mc_netid(msg) != tipc_net_id))) { (msg_mc_netid(msg) != tipc_net_id))) {
buf_discard(buf); buf_discard(buf);
...@@ -445,7 +443,6 @@ void tipc_bclink_recv_pkt(struct sk_buff *buf) ...@@ -445,7 +443,6 @@ void tipc_bclink_recv_pkt(struct sk_buff *buf)
} }
if (unlikely(msg_user(msg) == BCAST_PROTOCOL)) { if (unlikely(msg_user(msg) == BCAST_PROTOCOL)) {
msg_dbg(msg, "<BCNACK<<<");
if (msg_destnode(msg) == tipc_own_addr) { if (msg_destnode(msg) == tipc_own_addr) {
tipc_node_lock(node); tipc_node_lock(node);
tipc_bclink_acknowledge(node, msg_bcast_ack(msg)); tipc_bclink_acknowledge(node, msg_bcast_ack(msg));
......
...@@ -164,7 +164,6 @@ int tipc_register_media(u32 media_type, ...@@ -164,7 +164,6 @@ int tipc_register_media(u32 media_type,
m_ptr->priority = bearer_priority; m_ptr->priority = bearer_priority;
m_ptr->tolerance = link_tolerance; m_ptr->tolerance = link_tolerance;
m_ptr->window = send_window_limit; m_ptr->window = send_window_limit;
dbg("Media <%s> registered\n", name);
res = 0; res = 0;
exit: exit:
write_unlock_bh(&tipc_net_lock); write_unlock_bh(&tipc_net_lock);
......
...@@ -65,10 +65,8 @@ int tipc_cfg_append_tlv(struct sk_buff *buf, int tlv_type, ...@@ -65,10 +65,8 @@ int tipc_cfg_append_tlv(struct sk_buff *buf, int tlv_type,
struct tlv_desc *tlv = (struct tlv_desc *)skb_tail_pointer(buf); struct tlv_desc *tlv = (struct tlv_desc *)skb_tail_pointer(buf);
int new_tlv_space = TLV_SPACE(tlv_data_size); int new_tlv_space = TLV_SPACE(tlv_data_size);
if (skb_tailroom(buf) < new_tlv_space) { if (skb_tailroom(buf) < new_tlv_space)
dbg("tipc_cfg_append_tlv unable to append TLV\n");
return 0; return 0;
}
skb_put(buf, new_tlv_space); skb_put(buf, new_tlv_space);
tlv->tlv_type = htons(tlv_type); tlv->tlv_type = htons(tlv_type);
tlv->tlv_len = htons(TLV_LENGTH(tlv_data_size)); tlv->tlv_len = htons(TLV_LENGTH(tlv_data_size));
......
...@@ -243,7 +243,6 @@ u32 tipc_k_signal(Handler routine, unsigned long argument); ...@@ -243,7 +243,6 @@ u32 tipc_k_signal(Handler routine, unsigned long argument);
static inline void k_init_timer(struct timer_list *timer, Handler routine, static inline void k_init_timer(struct timer_list *timer, Handler routine,
unsigned long argument) unsigned long argument)
{ {
dbg("initializing timer %p\n", timer);
setup_timer(timer, routine, argument); setup_timer(timer, routine, argument);
} }
...@@ -263,7 +262,6 @@ static inline void k_init_timer(struct timer_list *timer, Handler routine, ...@@ -263,7 +262,6 @@ static inline void k_init_timer(struct timer_list *timer, Handler routine,
static inline void k_start_timer(struct timer_list *timer, unsigned long msec) static inline void k_start_timer(struct timer_list *timer, unsigned long msec)
{ {
dbg("starting timer %p for %u\n", timer, msec);
mod_timer(timer, jiffies + msecs_to_jiffies(msec) + 1); mod_timer(timer, jiffies + msecs_to_jiffies(msec) + 1);
} }
...@@ -280,7 +278,6 @@ static inline void k_start_timer(struct timer_list *timer, unsigned long msec) ...@@ -280,7 +278,6 @@ static inline void k_start_timer(struct timer_list *timer, unsigned long msec)
static inline void k_cancel_timer(struct timer_list *timer) static inline void k_cancel_timer(struct timer_list *timer)
{ {
dbg("cancelling timer %p\n", timer);
del_timer_sync(timer); del_timer_sync(timer);
} }
...@@ -298,7 +295,6 @@ static inline void k_cancel_timer(struct timer_list *timer) ...@@ -298,7 +295,6 @@ static inline void k_cancel_timer(struct timer_list *timer)
static inline void k_term_timer(struct timer_list *timer) static inline void k_term_timer(struct timer_list *timer)
{ {
dbg("terminating timer %p\n", timer);
} }
......
...@@ -133,7 +133,6 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct bearer *b_ptr) ...@@ -133,7 +133,6 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct bearer *b_ptr)
u32 type = msg_type(msg); u32 type = msg_type(msg);
msg_get_media_addr(msg,&media_addr); msg_get_media_addr(msg,&media_addr);
msg_dbg(msg, "RECV:");
buf_discard(buf); buf_discard(buf);
if (net_id != tipc_net_id) if (net_id != tipc_net_id)
...@@ -156,7 +155,6 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct bearer *b_ptr) ...@@ -156,7 +155,6 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct bearer *b_ptr)
struct tipc_node *n_ptr = tipc_node_find(orig); struct tipc_node *n_ptr = tipc_node_find(orig);
int link_fully_up; int link_fully_up;
dbg(" in own cluster\n");
if (n_ptr == NULL) { if (n_ptr == NULL) {
n_ptr = tipc_node_create(orig); n_ptr = tipc_node_create(orig);
if (!n_ptr) if (!n_ptr)
...@@ -173,7 +171,6 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct bearer *b_ptr) ...@@ -173,7 +171,6 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct bearer *b_ptr)
link = n_ptr->links[b_ptr->identity]; link = n_ptr->links[b_ptr->identity];
if (!link) { if (!link) {
dbg("creating link\n");
link = tipc_link_create(b_ptr, orig, &media_addr); link = tipc_link_create(b_ptr, orig, &media_addr);
if (!link) { if (!link) {
spin_unlock_bh(&n_ptr->lock); spin_unlock_bh(&n_ptr->lock);
...@@ -198,7 +195,6 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct bearer *b_ptr) ...@@ -198,7 +195,6 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct bearer *b_ptr)
return; return;
rbuf = tipc_disc_init_msg(DSC_RESP_MSG, 1, orig, b_ptr); rbuf = tipc_disc_init_msg(DSC_RESP_MSG, 1, orig, b_ptr);
if (rbuf != NULL) { if (rbuf != NULL) {
msg_dbg(buf_msg(rbuf),"SEND:");
b_ptr->media->send_msg(rbuf, &b_ptr->publ, &media_addr); b_ptr->media->send_msg(rbuf, &b_ptr->publ, &media_addr);
buf_discard(rbuf); buf_discard(rbuf);
} }
......
This diff is collapsed.
...@@ -87,7 +87,6 @@ static void publ_to_item(struct distr_item *i, struct publication *p) ...@@ -87,7 +87,6 @@ static void publ_to_item(struct distr_item *i, struct publication *p)
i->upper = htonl(p->upper); i->upper = htonl(p->upper);
i->ref = htonl(p->ref); i->ref = htonl(p->ref);
i->key = htonl(p->key); i->key = htonl(p->key);
dbg("publ_to_item: %u, %u, %u\n", p->type, p->lower, p->upper);
} }
/** /**
...@@ -147,7 +146,6 @@ void tipc_named_publish(struct publication *publ) ...@@ -147,7 +146,6 @@ void tipc_named_publish(struct publication *publ)
item = (struct distr_item *)msg_data(buf_msg(buf)); item = (struct distr_item *)msg_data(buf_msg(buf));
publ_to_item(item, publ); publ_to_item(item, publ);
dbg("tipc_named_publish: broadcasting publish msg\n");
named_cluster_distribute(buf); named_cluster_distribute(buf);
} }
...@@ -171,7 +169,6 @@ void tipc_named_withdraw(struct publication *publ) ...@@ -171,7 +169,6 @@ void tipc_named_withdraw(struct publication *publ)
item = (struct distr_item *)msg_data(buf_msg(buf)); item = (struct distr_item *)msg_data(buf_msg(buf));
publ_to_item(item, publ); publ_to_item(item, publ);
dbg("tipc_named_withdraw: broadcasting withdraw msg\n");
named_cluster_distribute(buf); named_cluster_distribute(buf);
} }
...@@ -209,9 +206,6 @@ void tipc_named_node_up(unsigned long node) ...@@ -209,9 +206,6 @@ void tipc_named_node_up(unsigned long node)
left -= ITEM_SIZE; left -= ITEM_SIZE;
if (!left) { if (!left) {
msg_set_link_selector(buf_msg(buf), node); msg_set_link_selector(buf_msg(buf), node);
dbg("tipc_named_node_up: sending publish msg to "
"<%u.%u.%u>\n", tipc_zone(node),
tipc_cluster(node), tipc_node(node));
tipc_link_send(buf, node, node); tipc_link_send(buf, node, node);
buf = NULL; buf = NULL;
} }
...@@ -236,8 +230,6 @@ static void node_is_down(struct publication *publ) ...@@ -236,8 +230,6 @@ static void node_is_down(struct publication *publ)
struct publication *p; struct publication *p;
write_lock_bh(&tipc_nametbl_lock); write_lock_bh(&tipc_nametbl_lock);
dbg("node_is_down: withdrawing %u, %u, %u\n",
publ->type, publ->lower, publ->upper);
publ->key += 1222345; publ->key += 1222345;
p = tipc_nametbl_remove_publ(publ->type, publ->lower, p = tipc_nametbl_remove_publ(publ->type, publ->lower,
publ->node, publ->ref, publ->key); publ->node, publ->ref, publ->key);
...@@ -268,9 +260,6 @@ void tipc_named_recv(struct sk_buff *buf) ...@@ -268,9 +260,6 @@ void tipc_named_recv(struct sk_buff *buf)
write_lock_bh(&tipc_nametbl_lock); write_lock_bh(&tipc_nametbl_lock);
while (count--) { while (count--) {
if (msg_type(msg) == PUBLICATION) { if (msg_type(msg) == PUBLICATION) {
dbg("tipc_named_recv: got publication for %u, %u, %u\n",
ntohl(item->type), ntohl(item->lower),
ntohl(item->upper));
publ = tipc_nametbl_insert_publ(ntohl(item->type), publ = tipc_nametbl_insert_publ(ntohl(item->type),
ntohl(item->lower), ntohl(item->lower),
ntohl(item->upper), ntohl(item->upper),
...@@ -285,9 +274,6 @@ void tipc_named_recv(struct sk_buff *buf) ...@@ -285,9 +274,6 @@ void tipc_named_recv(struct sk_buff *buf)
(net_ev_handler)node_is_down); (net_ev_handler)node_is_down);
} }
} else if (msg_type(msg) == WITHDRAWAL) { } else if (msg_type(msg) == WITHDRAWAL) {
dbg("tipc_named_recv: got withdrawl for %u, %u, %u\n",
ntohl(item->type), ntohl(item->lower),
ntohl(item->upper));
publ = tipc_nametbl_remove_publ(ntohl(item->type), publ = tipc_nametbl_remove_publ(ntohl(item->type),
ntohl(item->lower), ntohl(item->lower),
msg_orignode(msg), msg_orignode(msg),
......
...@@ -172,8 +172,6 @@ static struct name_seq *tipc_nameseq_create(u32 type, struct hlist_head *seq_hea ...@@ -172,8 +172,6 @@ static struct name_seq *tipc_nameseq_create(u32 type, struct hlist_head *seq_hea
spin_lock_init(&nseq->lock); spin_lock_init(&nseq->lock);
nseq->type = type; nseq->type = type;
nseq->sseqs = sseq; nseq->sseqs = sseq;
dbg("tipc_nameseq_create(): nseq = %p, type %u, ssseqs %p, ff: %u\n",
nseq, type, nseq->sseqs, nseq->first_free);
nseq->alloc = 1; nseq->alloc = 1;
INIT_HLIST_NODE(&nseq->ns_list); INIT_HLIST_NODE(&nseq->ns_list);
INIT_LIST_HEAD(&nseq->subscriptions); INIT_LIST_HEAD(&nseq->subscriptions);
...@@ -251,8 +249,6 @@ static struct publication *tipc_nameseq_insert_publ(struct name_seq *nseq, ...@@ -251,8 +249,6 @@ static struct publication *tipc_nameseq_insert_publ(struct name_seq *nseq,
int created_subseq = 0; int created_subseq = 0;
sseq = nameseq_find_subseq(nseq, lower); sseq = nameseq_find_subseq(nseq, lower);
dbg("nameseq_ins: for seq %p, {%u,%u}, found sseq %p\n",
nseq, type, lower, sseq);
if (sseq) { if (sseq) {
/* Lower end overlaps existing entry => need an exact match */ /* Lower end overlaps existing entry => need an exact match */
...@@ -289,18 +285,15 @@ static struct publication *tipc_nameseq_insert_publ(struct name_seq *nseq, ...@@ -289,18 +285,15 @@ static struct publication *tipc_nameseq_insert_publ(struct name_seq *nseq,
type, lower, upper); type, lower, upper);
return NULL; return NULL;
} }
dbg("Allocated %u more sseqs\n", nseq->alloc);
memcpy(sseqs, nseq->sseqs, memcpy(sseqs, nseq->sseqs,
nseq->alloc * sizeof(struct sub_seq)); nseq->alloc * sizeof(struct sub_seq));
kfree(nseq->sseqs); kfree(nseq->sseqs);
nseq->sseqs = sseqs; nseq->sseqs = sseqs;
nseq->alloc *= 2; nseq->alloc *= 2;
} }
dbg("Have %u sseqs for type %u\n", nseq->alloc, type);
/* Insert new sub-sequence */ /* Insert new sub-sequence */
dbg("ins in pos %u, ff = %u\n", inspos, nseq->first_free);
sseq = &nseq->sseqs[inspos]; sseq = &nseq->sseqs[inspos];
freesseq = &nseq->sseqs[nseq->first_free]; freesseq = &nseq->sseqs[nseq->first_free];
memmove(sseq + 1, sseq, (freesseq - sseq) * sizeof (*sseq)); memmove(sseq + 1, sseq, (freesseq - sseq) * sizeof (*sseq));
...@@ -310,17 +303,12 @@ static struct publication *tipc_nameseq_insert_publ(struct name_seq *nseq, ...@@ -310,17 +303,12 @@ static struct publication *tipc_nameseq_insert_publ(struct name_seq *nseq,
sseq->upper = upper; sseq->upper = upper;
created_subseq = 1; created_subseq = 1;
} }
dbg("inserting {%u,%u,%u} from <0x%x:%u> into sseq %p(%u,%u) of seq %p\n",
type, lower, upper, node, port, sseq,
sseq->lower, sseq->upper, nseq);
/* Insert a publication: */ /* Insert a publication: */
publ = publ_create(type, lower, upper, scope, node, port, key); publ = publ_create(type, lower, upper, scope, node, port, key);
if (!publ) if (!publ)
return NULL; return NULL;
dbg("inserting publ %p, node=0x%x publ->node=0x%x, subscr->node=%p\n",
publ, node, publ->node, publ->subscr.node);
sseq->zone_list_size++; sseq->zone_list_size++;
if (!sseq->zone_list) if (!sseq->zone_list)
...@@ -355,7 +343,6 @@ static struct publication *tipc_nameseq_insert_publ(struct name_seq *nseq, ...@@ -355,7 +343,6 @@ static struct publication *tipc_nameseq_insert_publ(struct name_seq *nseq,
* Any subscriptions waiting for notification? * Any subscriptions waiting for notification?
*/ */
list_for_each_entry_safe(s, st, &nseq->subscriptions, nameseq_list) { list_for_each_entry_safe(s, st, &nseq->subscriptions, nameseq_list) {
dbg("calling report_overlap()\n");
tipc_subscr_report_overlap(s, tipc_subscr_report_overlap(s,
publ->lower, publ->lower,
publ->upper, publ->upper,
...@@ -393,9 +380,6 @@ static struct publication *tipc_nameseq_remove_publ(struct name_seq *nseq, u32 i ...@@ -393,9 +380,6 @@ static struct publication *tipc_nameseq_remove_publ(struct name_seq *nseq, u32 i
if (!sseq) if (!sseq)
return NULL; return NULL;
dbg("tipc_nameseq_remove_publ: seq: %p, sseq %p, {%u,%u}, key %u\n",
nseq, sseq, nseq->type, inst, key);
/* Remove publication from zone scope list */ /* Remove publication from zone scope list */
prev = sseq->zone_list; prev = sseq->zone_list;
...@@ -549,16 +533,11 @@ static struct name_seq *nametbl_find_seq(u32 type) ...@@ -549,16 +533,11 @@ static struct name_seq *nametbl_find_seq(u32 type)
struct hlist_node *seq_node; struct hlist_node *seq_node;
struct name_seq *ns; struct name_seq *ns;
dbg("find_seq %u,(%u,0x%x) table = %p, hash[type] = %u\n",
type, htonl(type), type, table.types, hash(type));
seq_head = &table.types[hash(type)]; seq_head = &table.types[hash(type)];
hlist_for_each_entry(ns, seq_node, seq_head, ns_list) { hlist_for_each_entry(ns, seq_node, seq_head, ns_list) {
if (ns->type == type) { if (ns->type == type)
dbg("found %p\n", ns);
return ns; return ns;
} }
}
return NULL; return NULL;
}; };
...@@ -568,18 +547,14 @@ struct publication *tipc_nametbl_insert_publ(u32 type, u32 lower, u32 upper, ...@@ -568,18 +547,14 @@ struct publication *tipc_nametbl_insert_publ(u32 type, u32 lower, u32 upper,
{ {
struct name_seq *seq = nametbl_find_seq(type); struct name_seq *seq = nametbl_find_seq(type);
dbg("tipc_nametbl_insert_publ: {%u,%u,%u} found %p\n", type, lower, upper, seq);
if (lower > upper) { if (lower > upper) {
warn("Failed to publish illegal {%u,%u,%u}\n", warn("Failed to publish illegal {%u,%u,%u}\n",
type, lower, upper); type, lower, upper);
return NULL; return NULL;
} }
dbg("Publishing {%u,%u,%u} from 0x%x\n", type, lower, upper, node); if (!seq)
if (!seq) {
seq = tipc_nameseq_create(type, &table.types[hash(type)]); seq = tipc_nameseq_create(type, &table.types[hash(type)]);
dbg("tipc_nametbl_insert_publ: created %p\n", seq);
}
if (!seq) if (!seq)
return NULL; return NULL;
...@@ -596,7 +571,6 @@ struct publication *tipc_nametbl_remove_publ(u32 type, u32 lower, ...@@ -596,7 +571,6 @@ struct publication *tipc_nametbl_remove_publ(u32 type, u32 lower,
if (!seq) if (!seq)
return NULL; return NULL;
dbg("Withdrawing {%u,%u} from 0x%x\n", type, lower, node);
publ = tipc_nameseq_remove_publ(seq, lower, node, ref, key); publ = tipc_nameseq_remove_publ(seq, lower, node, ref, key);
if (!seq->first_free && list_empty(&seq->subscriptions)) { if (!seq->first_free && list_empty(&seq->subscriptions)) {
...@@ -792,7 +766,6 @@ int tipc_nametbl_withdraw(u32 type, u32 lower, u32 ref, u32 key) ...@@ -792,7 +766,6 @@ int tipc_nametbl_withdraw(u32 type, u32 lower, u32 ref, u32 key)
{ {
struct publication *publ; struct publication *publ;
dbg("tipc_nametbl_withdraw: {%u,%u}, key=%u\n", type, lower, key);
write_lock_bh(&tipc_nametbl_lock); write_lock_bh(&tipc_nametbl_lock);
publ = tipc_nametbl_remove_publ(type, lower, tipc_own_addr, ref, key); publ = tipc_nametbl_remove_publ(type, lower, tipc_own_addr, ref, key);
if (likely(publ)) { if (likely(publ)) {
...@@ -827,8 +800,6 @@ void tipc_nametbl_subscribe(struct subscription *s) ...@@ -827,8 +800,6 @@ void tipc_nametbl_subscribe(struct subscription *s)
} }
if (seq){ if (seq){
spin_lock_bh(&seq->lock); spin_lock_bh(&seq->lock);
dbg("tipc_nametbl_subscribe:found %p for {%u,%u,%u}\n",
seq, type, s->seq.lower, s->seq.upper);
tipc_nameseq_subscribe(seq, s); tipc_nameseq_subscribe(seq, s);
spin_unlock_bh(&seq->lock); spin_unlock_bh(&seq->lock);
} else { } else {
......
...@@ -138,22 +138,18 @@ static void net_route_named_msg(struct sk_buff *buf) ...@@ -138,22 +138,18 @@ static void net_route_named_msg(struct sk_buff *buf)
u32 dport; u32 dport;
if (!msg_named(msg)) { if (!msg_named(msg)) {
msg_dbg(msg, "tipc_net->drop_nam:");
buf_discard(buf); buf_discard(buf);
return; return;
} }
dnode = addr_domain(msg_lookup_scope(msg)); dnode = addr_domain(msg_lookup_scope(msg));
dport = tipc_nametbl_translate(msg_nametype(msg), msg_nameinst(msg), &dnode); dport = tipc_nametbl_translate(msg_nametype(msg), msg_nameinst(msg), &dnode);
dbg("tipc_net->lookup<%u,%u>-><%u,%x>\n",
msg_nametype(msg), msg_nameinst(msg), dport, dnode);
if (dport) { if (dport) {
msg_set_destnode(msg, dnode); msg_set_destnode(msg, dnode);
msg_set_destport(msg, dport); msg_set_destport(msg, dport);
tipc_net_route_msg(buf); tipc_net_route_msg(buf);
return; return;
} }
msg_dbg(msg, "tipc_net->rej:NO NAME: ");
tipc_reject_msg(buf, TIPC_ERR_NO_NAME); tipc_reject_msg(buf, TIPC_ERR_NO_NAME);
} }
...@@ -169,18 +165,14 @@ void tipc_net_route_msg(struct sk_buff *buf) ...@@ -169,18 +165,14 @@ void tipc_net_route_msg(struct sk_buff *buf)
msg_incr_reroute_cnt(msg); msg_incr_reroute_cnt(msg);
if (msg_reroute_cnt(msg) > 6) { if (msg_reroute_cnt(msg) > 6) {
if (msg_errcode(msg)) { if (msg_errcode(msg)) {
msg_dbg(msg, "NET>DISC>:");
buf_discard(buf); buf_discard(buf);
} else { } else {
msg_dbg(msg, "NET>REJ>:");
tipc_reject_msg(buf, msg_destport(msg) ? tipc_reject_msg(buf, msg_destport(msg) ?
TIPC_ERR_NO_PORT : TIPC_ERR_NO_NAME); TIPC_ERR_NO_PORT : TIPC_ERR_NO_NAME);
} }
return; return;
} }
msg_dbg(msg, "tipc_net->rout: ");
/* Handle message for this node */ /* Handle message for this node */
dnode = msg_short(msg) ? tipc_own_addr : msg_destnode(msg); dnode = msg_short(msg) ? tipc_own_addr : msg_destnode(msg);
if (tipc_in_scope(dnode, tipc_own_addr)) { if (tipc_in_scope(dnode, tipc_own_addr)) {
...@@ -201,14 +193,12 @@ void tipc_net_route_msg(struct sk_buff *buf) ...@@ -201,14 +193,12 @@ void tipc_net_route_msg(struct sk_buff *buf)
tipc_port_recv_proto_msg(buf); tipc_port_recv_proto_msg(buf);
break; break;
default: default:
msg_dbg(msg,"DROP/NET/<REC<");
buf_discard(buf); buf_discard(buf);
} }
return; return;
} }
/* Handle message for another node */ /* Handle message for another node */
msg_dbg(msg, "NET>SEND>: ");
skb_trim(buf, msg_size(msg)); skb_trim(buf, msg_size(msg));
tipc_link_send(buf, dnode, msg_link_selector(msg)); tipc_link_send(buf, dnode, msg_link_selector(msg));
} }
......
...@@ -97,7 +97,6 @@ void tipc_node_delete(struct tipc_node *n_ptr) ...@@ -97,7 +97,6 @@ void tipc_node_delete(struct tipc_node *n_ptr)
if (!n_ptr) if (!n_ptr)
return; return;
dbg("node %x deleted\n", n_ptr->addr);
n_num = tipc_node(n_ptr->addr); n_num = tipc_node(n_ptr->addr);
tipc_net.nodes[n_num] = NULL; tipc_net.nodes[n_num] = NULL;
kfree(n_ptr); kfree(n_ptr);
...@@ -124,7 +123,6 @@ void tipc_node_link_up(struct tipc_node *n_ptr, struct link *l_ptr) ...@@ -124,7 +123,6 @@ void tipc_node_link_up(struct tipc_node *n_ptr, struct link *l_ptr)
l_ptr->name, l_ptr->b_ptr->net_plane); l_ptr->name, l_ptr->b_ptr->net_plane);
if (!active[0]) { if (!active[0]) {
dbg(" link %x into %x/%x\n", l_ptr, &active[0], &active[1]);
active[0] = active[1] = l_ptr; active[0] = active[1] = l_ptr;
node_established_contact(n_ptr); node_established_contact(n_ptr);
return; return;
...@@ -302,7 +300,6 @@ void tipc_node_detach_link(struct tipc_node *n_ptr, struct link *l_ptr) ...@@ -302,7 +300,6 @@ void tipc_node_detach_link(struct tipc_node *n_ptr, struct link *l_ptr)
static void node_established_contact(struct tipc_node *n_ptr) static void node_established_contact(struct tipc_node *n_ptr)
{ {
dbg("node_established_contact:-> %x\n", n_ptr->addr);
tipc_k_signal((Handler)tipc_named_node_up, n_ptr->addr); tipc_k_signal((Handler)tipc_named_node_up, n_ptr->addr);
/* Syncronize broadcast acks */ /* Syncronize broadcast acks */
......
...@@ -188,7 +188,6 @@ void tipc_port_recv_mcast(struct sk_buff *buf, struct port_list *dp) ...@@ -188,7 +188,6 @@ void tipc_port_recv_mcast(struct sk_buff *buf, struct port_list *dp)
if (b == NULL) { if (b == NULL) {
warn("Unable to deliver multicast message(s)\n"); warn("Unable to deliver multicast message(s)\n");
msg_dbg(msg, "LOST:");
goto exit; goto exit;
} }
if ((index == 0) && (cnt != 0)) { if ((index == 0) && (cnt != 0)) {
...@@ -280,7 +279,6 @@ int tipc_deleteport(u32 ref) ...@@ -280,7 +279,6 @@ int tipc_deleteport(u32 ref)
spin_unlock_bh(&tipc_port_list_lock); spin_unlock_bh(&tipc_port_list_lock);
k_term_timer(&p_ptr->timer); k_term_timer(&p_ptr->timer);
kfree(p_ptr); kfree(p_ptr);
dbg("Deleted port %u\n", ref);
tipc_net_route_msg(buf); tipc_net_route_msg(buf);
return 0; return 0;
} }
...@@ -366,7 +364,6 @@ static struct sk_buff *port_build_proto_msg(u32 destport, u32 destnode, ...@@ -366,7 +364,6 @@ static struct sk_buff *port_build_proto_msg(u32 destport, u32 destnode,
msg_set_orignode(msg, orignode); msg_set_orignode(msg, orignode);
msg_set_transp_seqno(msg, seqno); msg_set_transp_seqno(msg, seqno);
msg_set_msgcnt(msg, ack); msg_set_msgcnt(msg, ack);
msg_dbg(msg, "PORT>SEND>:");
} }
return buf; return buf;
} }
...@@ -384,7 +381,6 @@ int tipc_reject_msg(struct sk_buff *buf, u32 err) ...@@ -384,7 +381,6 @@ int tipc_reject_msg(struct sk_buff *buf, u32 err)
data_sz = MAX_REJECT_SIZE; data_sz = MAX_REJECT_SIZE;
if (msg_connected(msg) && (imp < TIPC_CRITICAL_IMPORTANCE)) if (msg_connected(msg) && (imp < TIPC_CRITICAL_IMPORTANCE))
imp++; imp++;
msg_dbg(msg, "port->rej: ");
/* discard rejected message if it shouldn't be returned to sender */ /* discard rejected message if it shouldn't be returned to sender */
if (msg_errcode(msg) || msg_dest_droppable(msg)) { if (msg_errcode(msg) || msg_dest_droppable(msg)) {
...@@ -547,8 +543,6 @@ void tipc_port_recv_proto_msg(struct sk_buff *buf) ...@@ -547,8 +543,6 @@ void tipc_port_recv_proto_msg(struct sk_buff *buf)
struct sk_buff *r_buf = NULL; struct sk_buff *r_buf = NULL;
struct sk_buff *abort_buf = NULL; struct sk_buff *abort_buf = NULL;
msg_dbg(msg, "PORT<RECV<:");
if (!p_ptr) { if (!p_ptr) {
err = TIPC_ERR_NO_PORT; err = TIPC_ERR_NO_PORT;
} else if (p_ptr->publ.connected) { } else if (p_ptr->publ.connected) {
...@@ -1015,9 +1009,6 @@ int tipc_publish(u32 ref, unsigned int scope, struct tipc_name_seq const *seq) ...@@ -1015,9 +1009,6 @@ int tipc_publish(u32 ref, unsigned int scope, struct tipc_name_seq const *seq)
if (!p_ptr) if (!p_ptr)
return -EINVAL; return -EINVAL;
dbg("tipc_publ %u, p_ptr = %x, conn = %x, scope = %x, "
"lower = %u, upper = %u\n",
ref, p_ptr, p_ptr->publ.connected, scope, seq->lower, seq->upper);
if (p_ptr->publ.connected) if (p_ptr->publ.connected)
goto exit; goto exit;
if (seq->lower > seq->upper) if (seq->lower > seq->upper)
...@@ -1357,7 +1348,6 @@ int tipc_send_buf2port(u32 ref, struct tipc_portid const *dest, ...@@ -1357,7 +1348,6 @@ int tipc_send_buf2port(u32 ref, struct tipc_portid const *dest,
skb_push(buf, DIR_MSG_H_SIZE); skb_push(buf, DIR_MSG_H_SIZE);
skb_copy_to_linear_data(buf, msg, DIR_MSG_H_SIZE); skb_copy_to_linear_data(buf, msg, DIR_MSG_H_SIZE);
msg_dbg(msg, "buf2port: ");
p_ptr->sent++; p_ptr->sent++;
if (dest->node == tipc_own_addr) if (dest->node == tipc_own_addr)
return tipc_port_recv_msg(buf); return tipc_port_recv_msg(buf);
......
...@@ -316,7 +316,6 @@ static inline int tipc_port_recv_msg(struct sk_buff *buf) ...@@ -316,7 +316,6 @@ static inline int tipc_port_recv_msg(struct sk_buff *buf)
err = TIPC_ERR_NO_PORT; err = TIPC_ERR_NO_PORT;
} }
reject: reject:
dbg("port->rejecting, err = %x..\n",err);
return tipc_reject_msg(buf, err); return tipc_reject_msg(buf, err);
} }
......
...@@ -1226,44 +1226,27 @@ static u32 filter_rcv(struct sock *sk, struct sk_buff *buf) ...@@ -1226,44 +1226,27 @@ static u32 filter_rcv(struct sock *sk, struct sk_buff *buf)
*/ */
if (sock->state == SS_READY) { if (sock->state == SS_READY) {
if (msg_connected(msg)) { if (msg_connected(msg))
msg_dbg(msg, "dispatch filter 1\n");
return TIPC_ERR_NO_PORT; return TIPC_ERR_NO_PORT;
}
} else { } else {
if (msg_mcast(msg)) { if (msg_mcast(msg))
msg_dbg(msg, "dispatch filter 2\n");
return TIPC_ERR_NO_PORT; return TIPC_ERR_NO_PORT;
}
if (sock->state == SS_CONNECTED) { if (sock->state == SS_CONNECTED) {
if (!msg_connected(msg)) { if (!msg_connected(msg))
msg_dbg(msg, "dispatch filter 3\n");
return TIPC_ERR_NO_PORT; return TIPC_ERR_NO_PORT;
} } else if (sock->state == SS_CONNECTING) {
} if (!msg_connected(msg) && (msg_errcode(msg) == 0))
else if (sock->state == SS_CONNECTING) {
if (!msg_connected(msg) && (msg_errcode(msg) == 0)) {
msg_dbg(msg, "dispatch filter 4\n");
return TIPC_ERR_NO_PORT; return TIPC_ERR_NO_PORT;
} } else if (sock->state == SS_LISTENING) {
} if (msg_connected(msg) || msg_errcode(msg))
else if (sock->state == SS_LISTENING) {
if (msg_connected(msg) || msg_errcode(msg)) {
msg_dbg(msg, "dispatch filter 5\n");
return TIPC_ERR_NO_PORT; return TIPC_ERR_NO_PORT;
} } else if (sock->state == SS_DISCONNECTING) {
}
else if (sock->state == SS_DISCONNECTING) {
msg_dbg(msg, "dispatch filter 6\n");
return TIPC_ERR_NO_PORT; return TIPC_ERR_NO_PORT;
} } else /* (sock->state == SS_UNCONNECTED) */ {
else /* (sock->state == SS_UNCONNECTED) */ { if (msg_connected(msg) || msg_errcode(msg))
if (msg_connected(msg) || msg_errcode(msg)) {
msg_dbg(msg, "dispatch filter 7\n");
return TIPC_ERR_NO_PORT; return TIPC_ERR_NO_PORT;
} }
} }
}
/* Reject message if there isn't room to queue it */ /* Reject message if there isn't room to queue it */
...@@ -1280,7 +1263,6 @@ static u32 filter_rcv(struct sock *sk, struct sk_buff *buf) ...@@ -1280,7 +1263,6 @@ static u32 filter_rcv(struct sock *sk, struct sk_buff *buf)
/* Enqueue message (finally!) */ /* Enqueue message (finally!) */
msg_dbg(msg, "<DISP<: ");
TIPC_SKB_CB(buf)->handle = msg_data(msg); TIPC_SKB_CB(buf)->handle = msg_data(msg);
atomic_inc(&tipc_queue_size); atomic_inc(&tipc_queue_size);
__skb_queue_tail(&sk->sk_receive_queue, buf); __skb_queue_tail(&sk->sk_receive_queue, buf);
...@@ -1588,7 +1570,6 @@ static int accept(struct socket *sock, struct socket *new_sock, int flags) ...@@ -1588,7 +1570,6 @@ static int accept(struct socket *sock, struct socket *new_sock, int flags)
* Respond to 'SYN+' by queuing it on new socket. * Respond to 'SYN+' by queuing it on new socket.
*/ */
msg_dbg(msg,"<ACC<: ");
if (!msg_data_sz(msg)) { if (!msg_data_sz(msg)) {
struct msghdr m = {NULL,}; struct msghdr m = {NULL,};
......
...@@ -249,8 +249,6 @@ static void subscr_terminate(struct subscriber *subscriber) ...@@ -249,8 +249,6 @@ static void subscr_terminate(struct subscriber *subscriber)
k_cancel_timer(&sub->timer); k_cancel_timer(&sub->timer);
k_term_timer(&sub->timer); k_term_timer(&sub->timer);
} }
dbg("Term: Removing sub %u,%u,%u from subscriber %x list\n",
sub->seq.type, sub->seq.lower, sub->seq.upper, subscriber);
subscr_del(sub); subscr_del(sub);
} }
...@@ -307,8 +305,6 @@ static void subscr_cancel(struct tipc_subscr *s, ...@@ -307,8 +305,6 @@ static void subscr_cancel(struct tipc_subscr *s,
k_term_timer(&sub->timer); k_term_timer(&sub->timer);
spin_lock_bh(subscriber->lock); spin_lock_bh(subscriber->lock);
} }
dbg("Cancel: removing sub %u,%u,%u from subscriber %x list\n",
sub->seq.type, sub->seq.lower, sub->seq.upper, subscriber);
subscr_del(sub); subscr_del(sub);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment