From 7d91dd06b90e21109759084fe64110fb4a91b0fe Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Tue, 18 Oct 2011 14:47:02 -0400 Subject: [PATCH] --- yaml --- r: 279094 b: refs/heads/master c: bfec73d7e45cdf570d649a547050295789e1e6fb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/tipc/config.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 0be68f4ae039..442856db94bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c216e1d28c82332db0fa53e30536577fb6130c6 +refs/heads/master: bfec73d7e45cdf570d649a547050295789e1e6fb diff --git a/trunk/net/tipc/config.c b/trunk/net/tipc/config.c index b25a396b7e1e..4785bf26cdf4 100644 --- a/trunk/net/tipc/config.c +++ b/trunk/net/tipc/config.c @@ -184,13 +184,12 @@ static struct sk_buff *cfg_set_own_addr(void) " (cannot change node address once assigned)"); /* - * Must release all spinlocks before calling start_net() because - * Linux version of TIPC calls eth_media_start() which calls - * register_netdevice_notifier() which may block! - * - * Temporarily releasing the lock should be harmless for non-Linux TIPC, - * but Linux version of eth_media_start() should really be reworked - * so that it can be called with spinlocks held. + * Must temporarily release configuration spinlock while switching into + * networking mode as it calls tipc_eth_media_start(), which may sleep. + * Releasing the lock is harmless as other locally-issued configuration + * commands won't occur until this one completes, and remotely-issued + * configuration commands can't be received until a local configuration + * command to enable the first bearer is received and processed. */ spin_unlock_bh(&config_lock);