Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 205f356d authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

vxlan: make vxlan_sock_add and vxlan_sock_release complementary 



Make vxlan_sock_add both alloc the socket and attach it to vxlan_dev. Let
vxlan_sock_release accept vxlan_dev as its parameter instead of vxlan_sock.

This makes vxlan_sock_add and vxlan_sock release complementary. It reduces
code duplication in the next patch.

Signed-off-by: default avatarJiri Benc <jbenc@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8b7a7048

drivers/net/vxlan.c

+25 −28
Original line number Diff line number Diff line
@@ -75,8 +75,7 @@ static struct rtnl_link_ops vxlan_link_ops; 


static const u8 all_zeros_mac[ETH_ALEN];



static struct vxlan_sock *vxlan_sock_add(struct net *net, __be16 port,

					 bool no_share, u32 flags);

static int vxlan_sock_add(struct vxlan_dev *vxlan);



/* per-network namespace private data for this module */

struct vxlan_net {
@@ -1022,8 +1021,9 @@ static bool vxlan_group_used(struct vxlan_net *vn, struct vxlan_dev *dev) 
	return false;

}



static void vxlan_sock_release(struct vxlan_sock *vs)

static void vxlan_sock_release(struct vxlan_dev *vxlan)

{

	struct vxlan_sock *vs = vxlan->vn_sock;

	struct sock *sk = vs->sock->sk;

	struct net *net = sock_net(sk);

	struct vxlan_net *vn = net_generic(net, vxlan_net_id);
@@ -2244,22 +2244,18 @@ static void vxlan_uninit(struct net_device *dev) 
static int vxlan_open(struct net_device *dev)

{

	struct vxlan_dev *vxlan = netdev_priv(dev);

	struct vxlan_sock *vs;

	int ret = 0;



	vs = vxlan_sock_add(vxlan->net, vxlan->cfg.dst_port,

			    vxlan->cfg.no_share, vxlan->flags);

	if (IS_ERR(vs))

		return PTR_ERR(vs);

	int ret;



	vxlan_vs_add_dev(vs, vxlan);

	ret = vxlan_sock_add(vxlan);

	if (ret < 0)

		return ret;



	if (vxlan_addr_multicast(&vxlan->default_dst.remote_ip)) {

		ret = vxlan_igmp_join(vxlan);

		if (ret == -EADDRINUSE)

			ret = 0;

		if (ret) {

			vxlan_sock_release(vs);

			vxlan_sock_release(vxlan);

			return ret;

		}

	}
@@ -2294,7 +2290,6 @@ static int vxlan_stop(struct net_device *dev) 
{

	struct vxlan_dev *vxlan = netdev_priv(dev);

	struct vxlan_net *vn = net_generic(vxlan->net, vxlan_net_id);

	struct vxlan_sock *vs = vxlan->vn_sock;

	int ret = 0;



	if (vxlan_addr_multicast(&vxlan->default_dst.remote_ip) &&
@@ -2304,7 +2299,7 @@ static int vxlan_stop(struct net_device *dev) 
	del_timer_sync(&vxlan->age_timer);



	vxlan_flush(vxlan);

	vxlan_sock_release(vs);

	vxlan_sock_release(vxlan);



	return ret;

}
@@ -2592,27 +2587,29 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, __be16 port, 
	return vs;

}



static struct vxlan_sock *vxlan_sock_add(struct net *net, __be16 port,

					 bool no_share, u32 flags)

static int vxlan_sock_add(struct vxlan_dev *vxlan)

{

	struct vxlan_net *vn = net_generic(net, vxlan_net_id);

	struct vxlan_sock *vs;

	bool ipv6 = flags & VXLAN_F_IPV6;

	struct vxlan_net *vn = net_generic(vxlan->net, vxlan_net_id);

	struct vxlan_sock *vs = NULL;

	bool ipv6 = vxlan->flags & VXLAN_F_IPV6;



	if (!no_share) {

	if (!vxlan->cfg.no_share) {

		spin_lock(&vn->sock_lock);

		vs = vxlan_find_sock(net, ipv6 ? AF_INET6 : AF_INET, port,

				     flags);

		if (vs) {

			if (!atomic_add_unless(&vs->refcnt, 1, 0))

				vs = ERR_PTR(-EBUSY);

		vs = vxlan_find_sock(vxlan->net, ipv6 ? AF_INET6 : AF_INET,

				     vxlan->cfg.dst_port, vxlan->flags);

		if (vs && !atomic_add_unless(&vs->refcnt, 1, 0)) {

			spin_unlock(&vn->sock_lock);

			return vs;

			return -EBUSY;

		}

		spin_unlock(&vn->sock_lock);

	}



	return vxlan_socket_create(net, port, flags);

	if (!vs)

		vs = vxlan_socket_create(vxlan->net, vxlan->cfg.dst_port,

					 vxlan->flags);

	if (IS_ERR(vs))

		return PTR_ERR(vs);

	vxlan_vs_add_dev(vs, vxlan);

	return 0;

}



static int vxlan_dev_configure(struct net *src_net, struct net_device *dev,