]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
team: Simplify return path of team_newlink
authorToshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Tue, 5 Aug 2014 06:58:50 +0000 (15:58 +0900)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 Aug 2014 23:37:51 +0000 (16:37 -0700)
The variable "err" is not necessary.
Return register_netdevice() directly.

Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/team/team.c

index b4958c7ffa8415a84921995ce6123081e6596348..ef10302ec936ee5969001bb9da484b80d573c1ee 100644 (file)
@@ -2045,16 +2045,10 @@ static void team_setup(struct net_device *dev)
 static int team_newlink(struct net *src_net, struct net_device *dev,
                        struct nlattr *tb[], struct nlattr *data[])
 {
-       int err;
-
        if (tb[IFLA_ADDRESS] == NULL)
                eth_hw_addr_random(dev);
 
-       err = register_netdevice(dev);
-       if (err)
-               return err;
-
-       return 0;
+       return register_netdevice(dev);
 }
 
 static int team_validate(struct nlattr *tb[], struct nlattr *data[])