---

yaml
---
r: 63615
b: refs/heads/master
c: d788d80
h: refs/heads/master
i:
  63613: 053c464
  63611: 2c5943a
  63607: a7c64ec
  63599: 67041eb
  63583: 9ad2609
  63551: dc136b1
  63487: 8031156
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 248bbf38215fd5ce45a31c65c5e5511d9b611e5a
+refs/heads/master: d788d8056fd913defa48bd94f18dc53de98cd7a6

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,

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;