History

ovs: make functions local

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

Stephen Hemminger committed 12 years ago

Commit 443cd881 parent 09c5e604 files · +7 −6Browse files

Unified · Split

4 files
  1. net/openvswitch/datapath.c +2 −2
  2. net/openvswitch/datapath.h +0 −2
  3. net/openvswitch/vport.c +5 −1
  4. net/openvswitch/vport.h +0 −1
net/openvswitch/datapath.c+2−2
@@ -132,7 +132,7 @@ static struct datapath *get_dp(struct net *net, int dp_ifindex) · 131 unmodified lines
132}132}
133 133
134/* Must be called with rcu_read_lock or ovs_mutex. */134/* Must be called with rcu_read_lock or ovs_mutex. */
135const char *ovs_dp_name(const struct datapath *dp)135static const char *ovs_dp_name(const struct datapath *dp)
136{136{
137 struct vport *vport = ovs_vport_ovsl_rcu(dp, OVSP_LOCAL);137 struct vport *vport = ovs_vport_ovsl_rcu(dp, OVSP_LOCAL);
138 return vport->ops->get_name(vport);138 return vport->ops->get_name(vport);
@@ -1466,7 +1466,7 @@ struct genl_family dp_vport_genl_family = { · 1327 unmodified lines
1466 .parallel_ops = true,1466 .parallel_ops = true,
1467};1467};
1468 1468
1469struct genl_multicast_group ovs_dp_vport_multicast_group = {1469static struct genl_multicast_group ovs_dp_vport_multicast_group = {
1470 .name = OVS_VPORT_MCGROUP1470 .name = OVS_VPORT_MCGROUP
1471};1471};
1472 1472
net/openvswitch/datapath.h+0−2
@@ -182,14 +182,12 @@ static inline struct vport *ovs_vport_ovsl(const struct datapath *dp, int port_n · 181 unmodified lines
182 182
183extern struct notifier_block ovs_dp_device_notifier;183extern struct notifier_block ovs_dp_device_notifier;
184extern struct genl_family dp_vport_genl_family;184extern struct genl_family dp_vport_genl_family;
185extern struct genl_multicast_group ovs_dp_vport_multicast_group;
186 185
187void ovs_dp_process_received_packet(struct vport *, struct sk_buff *);186void ovs_dp_process_received_packet(struct vport *, struct sk_buff *);
188void ovs_dp_detach_port(struct vport *);187void ovs_dp_detach_port(struct vport *);
189int ovs_dp_upcall(struct datapath *, struct sk_buff *,188int ovs_dp_upcall(struct datapath *, struct sk_buff *,
190 const struct dp_upcall_info *);189 const struct dp_upcall_info *);
191 190
192const char *ovs_dp_name(const struct datapath *dp);
193struct sk_buff *ovs_vport_cmd_build_info(struct vport *, u32 pid, u32 seq,191struct sk_buff *ovs_vport_cmd_build_info(struct vport *, u32 pid, u32 seq,
194 u8 cmd);192 u8 cmd);
195 193
net/openvswitch/vport.c+5−1
@@ -33,6 +33,9 @@ · 32 unmodified lines
33#include "vport.h"33#include "vport.h"
34#include "vport-internal_dev.h"34#include "vport-internal_dev.h"
35 35
36static void ovs_vport_record_error(struct vport *,
37 enum vport_err_type err_type);
38
36/* List of statically compiled vport implementations. Don't forget to also39/* List of statically compiled vport implementations. Don't forget to also
37 * add yours to the list at the bottom of vport.h. */40 * add yours to the list at the bottom of vport.h. */
38static const struct vport_ops *vport_ops_list[] = {41static const struct vport_ops *vport_ops_list[] = {
@@ -396,7 +399,8 @@ int ovs_vport_send(struct vport *vport, struct sk_buff *skb) · 357 unmodified lines
396 * If using the vport generic stats layer indicate that an error of the given399 * If using the vport generic stats layer indicate that an error of the given
397 * type has occurred.400 * type has occurred.
398 */401 */
399void ovs_vport_record_error(struct vport *vport, enum vport_err_type err_type)402static void ovs_vport_record_error(struct vport *vport,
403 enum vport_err_type err_type)
400{404{
401 spin_lock(&vport->stats_lock);405 spin_lock(&vport->stats_lock);
402 406
net/openvswitch/vport.h+0−1
@@ -192,7 +192,6 @@ static inline struct vport *vport_from_priv(const void *priv) · 191 unmodified lines
192 192
193void ovs_vport_receive(struct vport *, struct sk_buff *,193void ovs_vport_receive(struct vport *, struct sk_buff *,
194 struct ovs_key_ipv4_tunnel *);194 struct ovs_key_ipv4_tunnel *);
195void ovs_vport_record_error(struct vport *, enum vport_err_type err_type);
196 195
197/* List of statically compiled vport implementations. Don't forget to also196/* List of statically compiled vport implementations. Don't forget to also
198 * add yours to the list at the top of vport.c. */197 * add yours to the list at the top of vport.c. */