diff options
| author | David S. Miller | 2016-10-19 21:11:56 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-10-19 21:11:56 +0200 |
| commit | e215701f2d1c521b2efee7cc35ef9097f80e4abe (patch) | |
| tree | 0d2d44f5678fe5bb5f94404895bc676bf4ccb58d | |
| parent | bpf: Detect identical PTR_TO_MAP_VALUE_OR_NULL registers (diff) | |
| parent | openvswitch: remove unnecessary EXPORT_SYMBOLs (diff) | |
| download | kernel-qcow2-linux-e215701f2d1c521b2efee7cc35ef9097f80e4abe.tar.gz kernel-qcow2-linux-e215701f2d1c521b2efee7cc35ef9097f80e4abe.tar.xz kernel-qcow2-linux-e215701f2d1c521b2efee7cc35ef9097f80e4abe.zip | |
Merge branch 'ovs-remove-unused'
Jiri Benc says:
====================
openvswitch: remove unused code
Removed unused functions and unnecessary EXPORT_SYMBOLs from openvswitch.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/openvswitch/datapath.c | 2 | ||||
| -rw-r--r-- | net/openvswitch/vport-netdev.c | 1 | ||||
| -rw-r--r-- | net/openvswitch/vport.c | 17 | ||||
| -rw-r--r-- | net/openvswitch/vport.h | 1 |
4 files changed, 0 insertions, 21 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 4d67ea856067..194435aa1165 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c @@ -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 *); diff --git a/net/openvswitch/vport-netdev.c b/net/openvswitch/vport-netdev.c index 4e3972344aa6..e825753de1e0 100644 --- a/net/openvswitch/vport-netdev.c +++ b/net/openvswitch/vport-netdev.c @@ -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) { diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c index 7387418ac514..9bb85b35a1fb 100644 --- a/net/openvswitch/vport.c +++ b/net/openvswitch/vport.c @@ -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) { diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h index f01f28a567ad..46e5b69927c7 100644 --- a/net/openvswitch/vport.h +++ b/net/openvswitch/vport.h @@ -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 |