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

Commit a9020fde authored by Pravin B Shelar's avatar Pravin B Shelar Committed by David S. Miller
Browse files

openvswitch: Move tunnel destroy function to oppenvswitch module. 



This function will be used in gre and geneve vport implementations.

Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
Acked-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fb811395

net/openvswitch/vport-netdev.c

+18 −3
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static struct vport *netdev_create(const struct vport_parms *parms) 
	return ovs_netdev_link(vport, parms->name);

}



void ovs_vport_free_rcu(struct rcu_head *rcu)

static void vport_netdev_free(struct rcu_head *rcu)

{

	struct vport *vport = container_of(rcu, struct vport, rcu);
@@ -155,7 +155,6 @@ void ovs_vport_free_rcu(struct rcu_head *rcu) 
		dev_put(vport->dev);

	ovs_vport_free(vport);

}

EXPORT_SYMBOL_GPL(ovs_vport_free_rcu);



void ovs_netdev_detach_dev(struct vport *vport)

{
@@ -175,9 +174,25 @@ static void netdev_destroy(struct vport *vport) 
		ovs_netdev_detach_dev(vport);

	rtnl_unlock();



	call_rcu(&vport->rcu, ovs_vport_free_rcu);

	call_rcu(&vport->rcu, vport_netdev_free);

}



void ovs_netdev_tunnel_destroy(struct vport *vport)

{

	rtnl_lock();

	if (vport->dev->priv_flags & IFF_OVS_DATAPATH)

		ovs_netdev_detach_dev(vport);



	/* Early release so we can unregister the device */

	dev_put(vport->dev);

	rtnl_delete_link(vport->dev);

	vport->dev = NULL;

	rtnl_unlock();



	call_rcu(&vport->rcu, vport_netdev_free);

}

EXPORT_SYMBOL_GPL(ovs_netdev_tunnel_destroy);



static unsigned int packet_length(const struct sk_buff *skb)

{

	unsigned int length = skb->len - ETH_HLEN;

net/openvswitch/vport-netdev.h

+1 −1
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ struct vport *ovs_netdev_get_vport(struct net_device *dev); 
struct vport *ovs_netdev_link(struct vport *vport, const char *name);

int ovs_netdev_send(struct vport *vport, struct sk_buff *skb);

void ovs_netdev_detach_dev(struct vport *);

void ovs_vport_free_rcu(struct rcu_head *);



int __init ovs_netdev_init(void);

void ovs_netdev_exit(void);



void ovs_netdev_tunnel_destroy(struct vport *vport);

#endif /* vport_netdev.h */

net/openvswitch/vport-vxlan.c

+1 −16
Original line number Diff line number Diff line
@@ -146,21 +146,6 @@ static struct vport *vxlan_create(const struct vport_parms *parms) 
	return ovs_netdev_link(vport, parms->name);

}



static void vxlan_destroy(struct vport *vport)

{

	rtnl_lock();

	if (vport->dev->priv_flags & IFF_OVS_DATAPATH)

		ovs_netdev_detach_dev(vport);



	/* Early release so we can unregister the device */

	dev_put(vport->dev);

	rtnl_delete_link(vport->dev);

	vport->dev = NULL;

	rtnl_unlock();



	call_rcu(&vport->rcu, ovs_vport_free_rcu);

}



static int vxlan_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,

				     struct ip_tunnel_info *egress_tun_info)

{
@@ -183,7 +168,7 @@ static int vxlan_get_egress_tun_info(struct vport *vport, struct sk_buff *skb, 
static struct vport_ops ovs_vxlan_netdev_vport_ops = {

	.type			= OVS_VPORT_TYPE_VXLAN,

	.create			= vxlan_create,

	.destroy		= vxlan_destroy,

	.destroy		= ovs_netdev_tunnel_destroy,

	.get_options		= vxlan_get_options,

	.send			= ovs_netdev_send,

	.get_egress_tun_info	= vxlan_get_egress_tun_info,