diff options
author | Allan Stephens <Allan.Stephens@windriver.com> | 2010-12-31 13:59:25 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-01 16:57:52 -0500 |
commit | b29f14284989b3d0b3a5ce268b5b1fc4df9c5795 (patch) | |
tree | a690fc7db347cb8ca2b38dc1da73a477d1fb4779 /net/tipc/net.c | |
parent | f5e75269f59f7c3816f23314b924895e4ecf8409 (diff) |
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: 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/net.c')
-rw-r--r-- | net/tipc/net.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c index 3baf55ee0985..6290becd35be 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c | |||
@@ -138,22 +138,18 @@ static void net_route_named_msg(struct sk_buff *buf) | |||
138 | u32 dport; | 138 | u32 dport; |
139 | 139 | ||
140 | if (!msg_named(msg)) { | 140 | if (!msg_named(msg)) { |
141 | msg_dbg(msg, "tipc_net->drop_nam:"); | ||
142 | buf_discard(buf); | 141 | buf_discard(buf); |
143 | return; | 142 | return; |
144 | } | 143 | } |
145 | 144 | ||
146 | dnode = addr_domain(msg_lookup_scope(msg)); | 145 | dnode = addr_domain(msg_lookup_scope(msg)); |
147 | dport = tipc_nametbl_translate(msg_nametype(msg), msg_nameinst(msg), &dnode); | 146 | dport = tipc_nametbl_translate(msg_nametype(msg), msg_nameinst(msg), &dnode); |
148 | dbg("tipc_net->lookup<%u,%u>-><%u,%x>\n", | ||
149 | msg_nametype(msg), msg_nameinst(msg), dport, dnode); | ||
150 | if (dport) { | 147 | if (dport) { |
151 | msg_set_destnode(msg, dnode); | 148 | msg_set_destnode(msg, dnode); |
152 | msg_set_destport(msg, dport); | 149 | msg_set_destport(msg, dport); |
153 | tipc_net_route_msg(buf); | 150 | tipc_net_route_msg(buf); |
154 | return; | 151 | return; |
155 | } | 152 | } |
156 | msg_dbg(msg, "tipc_net->rej:NO NAME: "); | ||
157 | tipc_reject_msg(buf, TIPC_ERR_NO_NAME); | 153 | tipc_reject_msg(buf, TIPC_ERR_NO_NAME); |
158 | } | 154 | } |
159 | 155 | ||
@@ -169,18 +165,14 @@ void tipc_net_route_msg(struct sk_buff *buf) | |||
169 | msg_incr_reroute_cnt(msg); | 165 | msg_incr_reroute_cnt(msg); |
170 | if (msg_reroute_cnt(msg) > 6) { | 166 | if (msg_reroute_cnt(msg) > 6) { |
171 | if (msg_errcode(msg)) { | 167 | if (msg_errcode(msg)) { |
172 | msg_dbg(msg, "NET>DISC>:"); | ||
173 | buf_discard(buf); | 168 | buf_discard(buf); |
174 | } else { | 169 | } else { |
175 | msg_dbg(msg, "NET>REJ>:"); | ||
176 | tipc_reject_msg(buf, msg_destport(msg) ? | 170 | tipc_reject_msg(buf, msg_destport(msg) ? |
177 | TIPC_ERR_NO_PORT : TIPC_ERR_NO_NAME); | 171 | TIPC_ERR_NO_PORT : TIPC_ERR_NO_NAME); |
178 | } | 172 | } |
179 | return; | 173 | return; |
180 | } | 174 | } |
181 | 175 | ||
182 | msg_dbg(msg, "tipc_net->rout: "); | ||
183 | |||
184 | /* Handle message for this node */ | 176 | /* Handle message for this node */ |
185 | dnode = msg_short(msg) ? tipc_own_addr : msg_destnode(msg); | 177 | dnode = msg_short(msg) ? tipc_own_addr : msg_destnode(msg); |
186 | if (tipc_in_scope(dnode, tipc_own_addr)) { | 178 | if (tipc_in_scope(dnode, tipc_own_addr)) { |
@@ -201,14 +193,12 @@ void tipc_net_route_msg(struct sk_buff *buf) | |||
201 | tipc_port_recv_proto_msg(buf); | 193 | tipc_port_recv_proto_msg(buf); |
202 | break; | 194 | break; |
203 | default: | 195 | default: |
204 | msg_dbg(msg,"DROP/NET/<REC<"); | ||
205 | buf_discard(buf); | 196 | buf_discard(buf); |
206 | } | 197 | } |
207 | return; | 198 | return; |
208 | } | 199 | } |
209 | 200 | ||
210 | /* Handle message for another node */ | 201 | /* Handle message for another node */ |
211 | msg_dbg(msg, "NET>SEND>: "); | ||
212 | skb_trim(buf, msg_size(msg)); | 202 | skb_trim(buf, msg_size(msg)); |
213 | tipc_link_send(buf, dnode, msg_link_selector(msg)); | 203 | tipc_link_send(buf, dnode, msg_link_selector(msg)); |
214 | } | 204 | } |