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

Commit e215701f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ovs-remove-unused' 



Jiri Benc says:

====================
openvswitch: remove unused code

Removed unused functions and unnecessary EXPORT_SYMBOLs from openvswitch.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 57a09bf0 76e4cc77

net/openvswitch/datapath.c

+0 −2
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ 
#include "vport-netdev.h"



int ovs_net_id __read_mostly;

EXPORT_SYMBOL_GPL(ovs_net_id);



static struct genl_family dp_packet_genl_family;

static struct genl_family dp_flow_genl_family;
@@ -131,7 +130,6 @@ int lockdep_ovsl_is_held(void) 
	else

		return 1;

}

EXPORT_SYMBOL_GPL(lockdep_ovsl_is_held);

#endif



static struct vport *new_vport(const struct vport_parms *);

net/openvswitch/vport-netdev.c

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ void ovs_netdev_detach_dev(struct vport *vport) 
				netdev_master_upper_dev_get(vport->dev));

	dev_set_promiscuity(vport->dev, -1);

}

EXPORT_SYMBOL_GPL(ovs_netdev_detach_dev);



static void netdev_destroy(struct vport *vport)

{

net/openvswitch/vport.c

+0 −17
Original line number Diff line number Diff line
@@ -463,23 +463,6 @@ int ovs_vport_receive(struct vport *vport, struct sk_buff *skb, 
	ovs_dp_process_packet(skb, &key);

	return 0;

}

EXPORT_SYMBOL_GPL(ovs_vport_receive);



static void free_vport_rcu(struct rcu_head *rcu)

{

	struct vport *vport = container_of(rcu, struct vport, rcu);



	ovs_vport_free(vport);

}



void ovs_vport_deferred_free(struct vport *vport)

{

	if (!vport)

		return;



	call_rcu(&vport->rcu, free_vport_rcu);

}

EXPORT_SYMBOL_GPL(ovs_vport_deferred_free);



static unsigned int packet_length(const struct sk_buff *skb)

{

net/openvswitch/vport.h

+0 −1
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ struct vport_ops { 
struct vport *ovs_vport_alloc(int priv_size, const struct vport_ops *,

			      const struct vport_parms *);

void ovs_vport_free(struct vport *);

void ovs_vport_deferred_free(struct vport *vport);



#define VPORT_ALIGN 8