diff options
author | Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp> | 2014-08-05 02:58:50 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-08-05 19:37:51 -0400 |
commit | ff204cce75d75678bf75fdd48c4c89fa30c555d3 (patch) | |
tree | 0310d1dd0881cd9de93ff0c40bb7ed4b03075841 /drivers/net/team | |
parent | fdb0a6626e8ef99fda8c30971c59ba51321dbab9 (diff) |
team: Simplify return path of team_newlink
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>
Diffstat (limited to 'drivers/net/team')
-rw-r--r-- | drivers/net/team/team.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index b4958c7ffa84..ef10302ec936 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c | |||
@@ -2045,16 +2045,10 @@ static void team_setup(struct net_device *dev) | |||
2045 | static int team_newlink(struct net *src_net, struct net_device *dev, | 2045 | static int team_newlink(struct net *src_net, struct net_device *dev, |
2046 | struct nlattr *tb[], struct nlattr *data[]) | 2046 | struct nlattr *tb[], struct nlattr *data[]) |
2047 | { | 2047 | { |
2048 | int err; | ||
2049 | |||
2050 | if (tb[IFLA_ADDRESS] == NULL) | 2048 | if (tb[IFLA_ADDRESS] == NULL) |
2051 | eth_hw_addr_random(dev); | 2049 | eth_hw_addr_random(dev); |
2052 | 2050 | ||
2053 | err = register_netdevice(dev); | 2051 | return register_netdevice(dev); |
2054 | if (err) | ||
2055 | return err; | ||
2056 | |||
2057 | return 0; | ||
2058 | } | 2052 | } |
2059 | 2053 | ||
2060 | static int team_validate(struct nlattr *tb[], struct nlattr *data[]) | 2054 | static int team_validate(struct nlattr *tb[], struct nlattr *data[]) |