Skip to contentSkip to conversation

rtnetlink: remove an unneeded test

PATCH Applied Dan Carpenter 3 participants 3 messages Aug 14, 2013 – Aug 15, 2013

Subsystems (3)
Networking Network drivers Kernel janitors
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 rtnetlink: remove an unneeded test

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 <[email protected]>
net/core/rtnetlink.c +2 -2
index 618dbe4..e7e058e 100644
@@ -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)
Reviewed-by on v1 1/1
#1 lore raw
Quoted 2 lines · Dan Carpenter

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" <[email protected]>
Quoted 20 lines
Signed-off-by Dan Carpenter <[email protected]>
net/core/rtnetlink.c +2 -2
index 618dbe4..e7e058e 100644
@@ -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)