diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-06-04 23:34:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-06-07 13:39:03 -0700 |
| commit | 8d76527e728d00d1cf9d5dd663caffb2dcf05ae6 (patch) | |
| tree | e3cae9cff087f2330a64a8ee7bff36c312d9471b /net | |
| parent | f0e48dbfc5c74e967fea4c0fd0c5ad07557ae0c8 (diff) | |
| download | linux-stable-8d76527e728d00d1cf9d5dd663caffb2dcf05ae6.tar.gz linux-stable-8d76527e728d00d1cf9d5dd663caffb2dcf05ae6.tar.bz2 linux-stable-8d76527e728d00d1cf9d5dd663caffb2dcf05ae6.zip | |
[IPV4]: Only panic if inetdev_init fails for loopback
When I made the inetdev_init call work on all devices I incorrectly
left in the panic call as well. It is obviously undesirable to
panic on an allocation failure for a normal network device. This
patch moves the panic call under the loopback if clause.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/devinet.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 7f95e6e9beeb..88a22d20bf73 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -1057,9 +1057,10 @@ static int inetdev_event(struct notifier_block *this, unsigned long event, if (!in_dev) { if (event == NETDEV_REGISTER) { in_dev = inetdev_init(dev); - if (!in_dev) - panic("devinet: Failed to create loopback\n"); if (dev == &loopback_dev) { + if (!in_dev) + panic("devinet: " + "Failed to create loopback\n"); in_dev->cnf.no_xfrm = 1; in_dev->cnf.no_policy = 1; } |