X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=net%2Ftipc%2Fconfig.c;h=ca3544d030c7f9177fbe426e9f955c4655c157cc;hb=ca1ee219c070eab755712d50638bbcd1f8630fc1;hp=16e7cb74969b02204b007d59ef9861372fdd4c11;hpb=59f0c4523fdea865fab7d69d878269992a9d08dd;p=linux-2.6-omap-h63xx.git

diff --git a/net/tipc/config.c b/net/tipc/config.c
index 16e7cb74969..ca3544d030c 100644
--- a/net/tipc/config.c
+++ b/net/tipc/config.c
@@ -293,7 +293,6 @@ static struct sk_buff *cfg_set_own_addr(void)
 	if (tipc_mode == TIPC_NET_MODE)
 		return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
 						   " (cannot change node address once assigned)");
-	tipc_own_addr = addr;
 
 	/*
 	 * Must release all spinlocks before calling start_net() because
@@ -306,7 +305,7 @@ static struct sk_buff *cfg_set_own_addr(void)
 	 */
 
 	spin_unlock_bh(&config_lock);
-	tipc_core_start_net();
+	tipc_core_start_net(addr);
 	spin_lock_bh(&config_lock);
 	return tipc_cfg_reply_none();
 }