* [patch] rtnetlink: remove an unneeded test
@ 2013-08-14 9:35 Dan Carpenter
2013-08-14 19:35 ` Eric W. Biederman
0 siblings, 1 reply; 3+ messages in thread
From: Dan Carpenter @ 2013-08-14 9:35 UTC (permalink / raw)
To: David S. Miller
Cc: John Fastabend, Jiri Pirko, Vlad Yasevich, Eric W. Biederman,
netdev, kernel-janitors
We know that "dev" is a valid pointer at this point, so we can remove
the test and clean up a little.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 618dbe4..e7e058e 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1867,10 +1867,10 @@ replay:
else
err = register_netdevice(dev);
- if (err < 0 && !IS_ERR(dev))
+ if (err < 0) {
free_netdev(dev);
- if (err < 0)
goto out;
+ }
err = rtnl_configure_link(dev, ifm);
if (err < 0)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [patch] rtnetlink: remove an unneeded test
2013-08-14 9:35 [patch] rtnetlink: remove an unneeded test Dan Carpenter
@ 2013-08-14 19:35 ` Eric W. Biederman
2013-08-15 8:29 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Eric W. Biederman @ 2013-08-14 19:35 UTC (permalink / raw)
To: Dan Carpenter
Cc: David S. Miller, John Fastabend, Jiri Pirko, Vlad Yasevich,
netdev, kernel-janitors
Dan Carpenter <dan.carpenter@oracle.com> writes:
> We know that "dev" is a valid pointer at this point, so we can remove
> the test and clean up a little.
Quite right.
Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.com>
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
> index 618dbe4..e7e058e 100644
> --- a/net/core/rtnetlink.c
> +++ b/net/core/rtnetlink.c
> @@ -1867,10 +1867,10 @@ replay:
> else
> err = register_netdevice(dev);
>
> - if (err < 0 && !IS_ERR(dev))
> + if (err < 0) {
> free_netdev(dev);
> - if (err < 0)
> goto out;
> + }
>
> err = rtnl_configure_link(dev, ifm);
> if (err < 0)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch] rtnetlink: remove an unneeded test
2013-08-14 19:35 ` Eric W. Biederman
@ 2013-08-15 8:29 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2013-08-15 8:29 UTC (permalink / raw)
To: ebiederm
Cc: dan.carpenter, john.r.fastabend, jiri, vyasevic, netdev,
kernel-janitors
From: ebiederm@xmission.com (Eric W. Biederman)
Date: Wed, 14 Aug 2013 12:35:24 -0700
> Dan Carpenter <dan.carpenter@oracle.com> writes:
>
>> We know that "dev" is a valid pointer at this point, so we can remove
>> the test and clean up a little.
>
> Quite right.
>
> Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.com>
>
>>
>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied to net-next, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-08-15 8:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-14 9:35 [patch] rtnetlink: remove an unneeded test Dan Carpenter
2013-08-14 19:35 ` Eric W. Biederman
2013-08-15 8:29 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).