--- zzzz-none-000/linux-2.6.32.61/net/tipc/socket.c	2013-06-10 09:43:48.000000000 +0000
+++ ar10-7272-687/linux-2.6.32.61/net/tipc/socket.c	2013-10-22 15:04:02.000000000 +0000
@@ -800,7 +800,7 @@
 	if (addr) {
 		addr->family = AF_TIPC;
 		addr->addrtype = TIPC_ADDR_ID;
-		memset(&addr->addr, 0, sizeof(addr->addr));
+        memset(&addr->addr, 0, sizeof(addr->addr));
 		addr->addr.id.ref = msg_origport(msg);
 		addr->addr.id.node = msg_orignode(msg);
 		addr->addr.name.domain = 0;   	/* could leave uninitialized */
@@ -916,9 +916,8 @@
 		res = -ENOTCONN;
 		goto exit;
 	}
-
-	/* will be updated in set_orig_addr() if needed */
-	m->msg_namelen = 0;
+    /* will be updated in set_orig_addr() if needed */
+    m->msg_namelen = 0;
 
 restart:
 
@@ -1053,11 +1052,10 @@
 		goto exit;
 	}
 
+restart:
 	/* will be updated in set_orig_addr() if needed */
 	m->msg_namelen = 0;
 
-restart:
-
 	/* Look for a message in receive queue; wait if necessary */
 
 	while (skb_queue_empty(&sk->sk_receive_queue)) {