From 5e0fa15adc860e3e64ca3ae358dc41329dbef587 Mon Sep 17 00:00:00 2001
From: Florian Westphal <fw@strlen.de>
Date: Thu, 2 Aug 2007 19:28:06 -0700
Subject: [PATCH] --- yaml --- r: 63615 b: refs/heads/master c:
 d788d8056fd913defa48bd94f18dc53de98cd7a6 h: refs/heads/master i:   63613:
 053c4645d02a8be6a091a009929a428b1944984a   63611:
 2c5943afa9ef3000ff7332d0b0200b2ac0b264b9   63607:
 a7c64ec4420987efe8214225fdc78f29584f51fb   63599:
 67041ebbc096055535b93915120987b8139cb087   63583:
 9ad2609051110011b76ce4a6b27f0128af5f6122   63551:
 dc136b17c9a30aee1927f6afd747e479ed3d1377   63487:
 8031156924b9ef682436918f5ea3f5b322cdd5a0 v: v3

---
 [refs]                | 2 +-
 trunk/net/tipc/link.c | 2 +-
 trunk/net/tipc/node.c | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index aa9b453d2a24..89e911a75f22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 248bbf38215fd5ce45a31c65c5e5511d9b611e5a
+refs/heads/master: d788d8056fd913defa48bd94f18dc53de98cd7a6
diff --git a/trunk/net/tipc/link.c b/trunk/net/tipc/link.c
index 1d674e0848fa..1b17fecee747 100644
--- a/trunk/net/tipc/link.c
+++ b/trunk/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/trunk/net/tipc/node.c b/trunk/net/tipc/node.c
index e2e452a62ba1..598f4d3a0098 100644
--- a/trunk/net/tipc/node.c
+++ b/trunk/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;