From: Herbert Xu Date: Tue, 5 Jun 2007 06:34:08 +0000 (-0700) Subject: [IPV4]: Only panic if inetdev_init fails for loopback X-Git-Tag: v2.6.22-rc5~95^2~17 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8d76527e728d00d1cf9d5dd663caffb2dcf05ae6;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: David S. Miller --- diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 7f95e6e9bee..88a22d20bf7 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; }