From 276484a29b9e3eac3410eb5d750bfcf02b97c5af Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Mon, 15 Oct 2007 12:55:33 -0700 Subject: [PATCH] --- yaml --- r: 69433 b: refs/heads/master c: 9d6dda32c7570bbf189cf74fbc36338d0a94e999 h: refs/heads/master i: 69431: d98f574222d81aa8d804b7da1ee77dd2fec53576 v: v3 --- [refs] | 2 +- trunk/drivers/net/loopback.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b78a566b1185..28a76d532e12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ae289444b968b4cefd776ada8da519ce10e56fa +refs/heads/master: 9d6dda32c7570bbf189cf74fbc36338d0a94e999 diff --git a/trunk/drivers/net/loopback.c b/trunk/drivers/net/loopback.c index be25aa33971c..662b8d16803c 100644 --- a/trunk/drivers/net/loopback.c +++ b/trunk/drivers/net/loopback.c @@ -265,17 +265,16 @@ static __net_init int loopback_net_init(struct net *net) if (err) goto out_free_netdev; - err = 0; net->loopback_dev = dev; + return 0; -out: - if (err) - panic("loopback: Failed to register netdevice: %d\n", err); - return err; out_free_netdev: free_netdev(dev); - goto out; +out: + if (net == &init_net) + panic("loopback: Failed to register netdevice: %d\n", err); + return err; } static __net_exit void loopback_net_exit(struct net *net)