diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-23 17:13:56 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-23 17:13:56 -0500 |
| commit | abb434cb0539fb355c1c921f8fd761efbbac3462 (patch) | |
| tree | 24a7d99ec161f8fd4dc9ff03c9c4cc93be883ce6 /net/ipv4/ipconfig.c | |
| parent | 2494654d4890316e7340fb8b3458daad0474a1b9 (diff) | |
| parent | 6350323ad8def2ac00d77cdee3b79c9b9fba75c4 (diff) | |
| download | linux-stable-abb434cb0539fb355c1c921f8fd761efbbac3462.tar.gz linux-stable-abb434cb0539fb355c1c921f8fd761efbbac3462.tar.bz2 linux-stable-abb434cb0539fb355c1c921f8fd761efbbac3462.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/bluetooth/l2cap_core.c
Just two overlapping changes, one added an initialization of
a local variable, and another change added a new local variable.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipconfig.c')
| -rw-r--r-- | net/ipv4/ipconfig.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index 915eb5265b2e..7e4ec9fc2cef 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c @@ -253,6 +253,10 @@ static int __init ic_open_devs(void) } } + /* no point in waiting if we could not bring up at least one device */ + if (!ic_first_dev) + goto have_carrier; + /* wait for a carrier on at least one device */ start = jiffies; while (jiffies - start < msecs_to_jiffies(CONF_CARRIER_TIMEOUT)) { |