From 574f1fb57a75affcd3953dab6119b061d1eff67f Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 6 Jan 2011 13:18:10 -0800 Subject: [PATCH] datapath: Distinguish set_config() functions' names. Both tunnel.c and vport-patch.c have set_config() functions. They are static so this does not confuse the compiler, but it does (slightly) confuse me from time to time, so this commit changes their names to tnl_set_config() and patch_set_config(), respectively. Signed-off-by: Ben Pfaff Acked-by: Jesse Gross --- datapath/tunnel.c | 12 ++++++------ datapath/vport-patch.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/datapath/tunnel.c b/datapath/tunnel.c index e42e0e36..46f966b8 100644 --- a/datapath/tunnel.c +++ b/datapath/tunnel.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Nicira Networks. + * Copyright (c) 2010, 2011 Nicira Networks. * Distributed under the terms of the GNU GPL version 2. * * Significant portions of this file may be copied from parts of the Linux @@ -1323,9 +1323,9 @@ out: return sent_len; } -static int set_config(const void *config, const struct tnl_ops *tnl_ops, - const struct vport *cur_vport, - struct tnl_mutable_config *mutable) +static int tnl_set_config(const void *config, const struct tnl_ops *tnl_ops, + const struct vport *cur_vport, + struct tnl_mutable_config *mutable) { const struct vport *old_vport; const struct tnl_mutable_config *old_mutable; @@ -1399,7 +1399,7 @@ struct vport *tnl_create(const struct vport_parms *parms, get_random_bytes(&initial_frag_id, sizeof(int)); atomic_set(&tnl_vport->frag_id, initial_frag_id); - err = set_config(parms->config, tnl_ops, NULL, mutable); + err = tnl_set_config(parms->config, tnl_ops, NULL, mutable); if (err) goto error_free_mutable; @@ -1439,7 +1439,7 @@ int tnl_modify(struct vport *vport, struct odp_port *port) goto error; } - err = set_config(port->config, tnl_vport->tnl_ops, vport, mutable); + err = tnl_set_config(port->config, tnl_vport->tnl_ops, vport, mutable); if (err) goto error_free; diff --git a/datapath/vport-patch.c b/datapath/vport-patch.c index 3093e29f..74d10f6d 100644 --- a/datapath/vport-patch.c +++ b/datapath/vport-patch.c @@ -85,8 +85,8 @@ static void patch_exit(void) kfree(peer_table); } -static int set_config(struct vport *vport, const void *config, - struct patch_config *patchconf) +static int patch_set_config(struct vport *vport, const void *config, + struct patch_config *patchconf) { struct patch_vport *patch_vport = patch_vport_priv(vport); char peer_name[IFNAMSIZ]; @@ -125,7 +125,7 @@ static struct vport *patch_create(const struct vport_parms *parms) goto error_free_vport; } - err = set_config(vport, parms->config, patchconf); + err = patch_set_config(vport, parms->config, patchconf); if (err) goto error_free_patchconf; @@ -165,7 +165,7 @@ static int patch_modify(struct vport *vport, struct odp_port *port) goto error; } - err = set_config(vport, port->config, patchconf); + err = patch_set_config(vport, port->config, patchconf); if (err) goto error_free; -- 2.30.2