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

Commit 443cd88c authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jesse Gross
Browse files

ovs: make functions local 



Several functions and datastructures could be local
Found with 'make namespacecheck'

Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarJesse Gross <jesse@nicira.com>
parent 09c5e605

net/openvswitch/datapath.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -132,7 +132,7 @@ static struct datapath *get_dp(struct net *net, int dp_ifindex) 
}

}





/* Must be called with rcu_read_lock or ovs_mutex. */

/* Must be called with rcu_read_lock or ovs_mutex. */

const char *ovs_dp_name(const struct datapath *dp)

static const char *ovs_dp_name(const struct datapath *dp)

{

{

	struct vport *vport = ovs_vport_ovsl_rcu(dp, OVSP_LOCAL);

	struct vport *vport = ovs_vport_ovsl_rcu(dp, OVSP_LOCAL);

	return vport->ops->get_name(vport);

	return vport->ops->get_name(vport);
@@ -1466,7 +1466,7 @@ struct genl_family dp_vport_genl_family = { 
	.parallel_ops = true,

	.parallel_ops = true,

};

};





struct genl_multicast_group ovs_dp_vport_multicast_group = {

static struct genl_multicast_group ovs_dp_vport_multicast_group = {

	.name = OVS_VPORT_MCGROUP

	.name = OVS_VPORT_MCGROUP

};

};

net/openvswitch/datapath.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -182,14 +182,12 @@ static inline struct vport *ovs_vport_ovsl(const struct datapath *dp, int port_n 




extern struct notifier_block ovs_dp_device_notifier;

extern struct notifier_block ovs_dp_device_notifier;

extern struct genl_family dp_vport_genl_family;

extern struct genl_family dp_vport_genl_family;

extern struct genl_multicast_group ovs_dp_vport_multicast_group;





void ovs_dp_process_received_packet(struct vport *, struct sk_buff *);

void ovs_dp_process_received_packet(struct vport *, struct sk_buff *);

void ovs_dp_detach_port(struct vport *);

void ovs_dp_detach_port(struct vport *);

int ovs_dp_upcall(struct datapath *, struct sk_buff *,

int ovs_dp_upcall(struct datapath *, struct sk_buff *,

		  const struct dp_upcall_info *);

		  const struct dp_upcall_info *);





const char *ovs_dp_name(const struct datapath *dp);

struct sk_buff *ovs_vport_cmd_build_info(struct vport *, u32 pid, u32 seq,

struct sk_buff *ovs_vport_cmd_build_info(struct vport *, u32 pid, u32 seq,

					 u8 cmd);

					 u8 cmd);

net/openvswitch/vport.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -33,6 +33,9 @@ 
#include "vport.h"

#include "vport.h"

#include "vport-internal_dev.h"

#include "vport-internal_dev.h"





static void ovs_vport_record_error(struct vport *,

				   enum vport_err_type err_type);



/* List of statically compiled vport implementations.  Don't forget to also

/* List of statically compiled vport implementations.  Don't forget to also

 * add yours to the list at the bottom of vport.h. */

 * add yours to the list at the bottom of vport.h. */

static const struct vport_ops *vport_ops_list[] = {

static const struct vport_ops *vport_ops_list[] = {
@@ -396,7 +399,8 @@ int ovs_vport_send(struct vport *vport, struct sk_buff *skb) 
 * If using the vport generic stats layer indicate that an error of the given

 * If using the vport generic stats layer indicate that an error of the given

 * type has occurred.

 * type has occurred.

 */

 */

void ovs_vport_record_error(struct vport *vport, enum vport_err_type err_type)

static void ovs_vport_record_error(struct vport *vport,

				   enum vport_err_type err_type)

{

{

	spin_lock(&vport->stats_lock);

	spin_lock(&vport->stats_lock);

net/openvswitch/vport.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -192,7 +192,6 @@ static inline struct vport *vport_from_priv(const void *priv) 




void ovs_vport_receive(struct vport *, struct sk_buff *,

void ovs_vport_receive(struct vport *, struct sk_buff *,

		       struct ovs_key_ipv4_tunnel *);

		       struct ovs_key_ipv4_tunnel *);

void ovs_vport_record_error(struct vport *, enum vport_err_type err_type);





/* List of statically compiled vport implementations.  Don't forget to also

/* List of statically compiled vport implementations.  Don't forget to also

 * add yours to the list at the top of vport.c. */

 * add yours to the list at the top of vport.c. */