GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-18 20:54:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ipv4: streamline ipmr_new_tunnel

Browse source 
Reduce a few level of indentation to simplify the function.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Christoph Hellwig 2020-05-19 15:03:11 +02:00 • committed by David S. Miller
parent befb270f50
commit c384b8a70c
1 changed files with 36 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
net/ipv4/ipmr.c
View file

@ -471,17 +471,16 @@ static bool ipmr_init_vif_indev(const struct net_device *dev)
static struct net_device *ipmr_new_tunnel(struct net *net, struct vifctl *v) static struct net_device *ipmr_new_tunnel(struct net *net, struct vifctl *v)
{ {
struct net_device *dev; struct net_device *tunnel_dev, *new_dev;
struct ip_tunnel_parm p = { };
dev = __dev_get_by_name(net, "tunl0"); mm_segment_t oldfs = get_fs();
if (dev) {
const struct net_device_ops *ops = dev->netdev_ops;
int err;
struct ifreq ifr; struct ifreq ifr;
struct ip_tunnel_parm p; int err;
tunnel_dev = __dev_get_by_name(net, "tunl0");
if (!tunnel_dev)
goto out;
memset(&p, 0, sizeof(p));
p.iph.daddr = v->vifc_rmt_addr.s_addr; p.iph.daddr = v->vifc_rmt_addr.s_addr;
p.iph.saddr = v->vifc_lcl_addr.s_addr; p.iph.saddr = v->vifc_lcl_addr.s_addr;
p.iph.version = 4; p.iph.version = 4;
@ -490,31 +489,31 @@ static struct net_device *ipmr_new_tunnel(struct net *net, struct vifctl *v)
sprintf(p.name, "dvmrp%d", v->vifc_vifi); sprintf(p.name, "dvmrp%d", v->vifc_vifi);
ifr.ifr_ifru.ifru_data = (__force void __user *)&p; ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
if (ops->ndo_do_ioctl) { if (!tunnel_dev->netdev_ops->ndo_do_ioctl)
mm_segment_t oldfs = get_fs(); goto out;
set_fs(KERNEL_DS); set_fs(KERNEL_DS);
err = ops->ndo_do_ioctl(dev, &ifr, SIOCADDTUNNEL); err = tunnel_dev->netdev_ops->ndo_do_ioctl(tunnel_dev, &ifr,
SIOCADDTUNNEL);
set_fs(oldfs); set_fs(oldfs);
} else { if (err)
err = -EOPNOTSUPP; goto out;
}
dev = NULL;
if (err == 0 && new_dev = __dev_get_by_name(net, p.name);
(dev = __dev_get_by_name(net, p.name)) != NULL) { if (!new_dev)
dev->flags |= IFF_MULTICAST; goto out;
if (!ipmr_init_vif_indev(dev))
goto failure;
if (dev_open(dev, NULL))
goto failure;
dev_hold(dev);
}
}
return dev;
failure: new_dev->flags |= IFF_MULTICAST;
unregister_netdevice(dev); if (!ipmr_init_vif_indev(new_dev))
goto out_unregister;
if (dev_open(new_dev, NULL))
goto out_unregister;
dev_hold(new_dev);
return new_dev;
out_unregister:
unregister_netdevice(new_dev);
out:
return NULL; return NULL;
} }