diff options
| author | Florian Westphal <fw@strlen.de> | 2007-08-02 19:28:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-08-02 19:42:31 -0700 |
| commit | d788d8056fd913defa48bd94f18dc53de98cd7a6 (patch) | |
| tree | 139588307f7706579c39541343f8fb77af895b35 | |
| parent | 248bbf38215fd5ce45a31c65c5e5511d9b611e5a (diff) | |
| download | op-kernel-dev-d788d8056fd913defa48bd94f18dc53de98cd7a6.zip op-kernel-dev-d788d8056fd913defa48bd94f18dc53de98cd7a6.tar.gz | |
[TIPC]: Fix two minor sparse warnings.
fix two warnings generated by sparse:
link.c:2386 symbol 'msgcount' shadows an earlier one
node.c:244 symbol 'addr_string' shadows an earlier one
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/tipc/link.c | 2 | ||||
| -rw-r--r-- | net/tipc/node.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index 1d674e0..1b17fec 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -2383,10 +2383,10 @@ void tipc_link_changeover(struct link *l_ptr) struct tipc_msg *msg = buf_msg(crs); if ((msg_user(msg) == MSG_BUNDLER) && split_bundles) { - u32 msgcount = msg_msgcnt(msg); struct tipc_msg *m = msg_get_wrapped(msg); unchar* pos = (unchar*)m; + msgcount = msg_msgcnt(msg); while (msgcount--) { msg_set_seqno(m,msg_seqno(msg)); tipc_link_tunnel(l_ptr, &tunnel_hdr, m, diff --git a/net/tipc/node.c b/net/tipc/node.c index e2e452a..598f4d3 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c @@ -241,8 +241,6 @@ struct node *tipc_node_attach_link(struct link *l_ptr) char addr_string[16]; if (n_ptr->link_cnt >= 2) { - char addr_string[16]; - err("Attempt to create third link to %s\n", addr_string_fill(addr_string, n_ptr->addr)); return NULL; |
