diff options
| author | David S. Miller | 2015-12-04 03:03:21 +0100 |
|---|---|---|
| committer | David S. Miller | 2015-12-04 03:09:12 +0100 |
| commit | f188b951f33a0464338f94f928338f84fc0e4392 (patch) | |
| tree | 17ad63719242b1de0266627a1dc92ba869a3ba4e /drivers/net/vrf.c | |
| parent | mlxsw: core: Change BUG to WARN in hwmon code (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-f188b951f33a0464338f94f928338f84fc0e4392.tar.gz kernel-qcow2-linux-f188b951f33a0464338f94f928338f84fc0e4392.tar.xz kernel-qcow2-linux-f188b951f33a0464338f94f928338f84fc0e4392.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/renesas/ravb_main.c
kernel/bpf/syscall.c
net/ipv4/ipmr.c
All three conflicts were cases of overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vrf.c')
| -rw-r--r-- | drivers/net/vrf.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 8944a49cda15..56abdf224d35 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -849,7 +849,6 @@ static int vrf_newlink(struct net *src_net, struct net_device *dev, struct nlattr *tb[], struct nlattr *data[]) { struct net_vrf *vrf = netdev_priv(dev); - int err; if (!data || !data[IFLA_VRF_TABLE]) return -EINVAL; @@ -858,15 +857,7 @@ static int vrf_newlink(struct net *src_net, struct net_device *dev, dev->priv_flags |= IFF_L3MDEV_MASTER; - err = register_netdevice(dev); - if (err < 0) - goto out_fail; - - return 0; - -out_fail: - free_netdev(dev); - return err; + return register_netdevice(dev); } static size_t vrf_nl_getsize(const struct net_device *dev) |