[ovs-dev] [PATCH] Spell verb form of "set up" correctly throughout the tree.
Ben Pfaff
blp at nicira.com
Mon Oct 26 19:44:33 UTC 2009
---
datapath/datapath.c | 2 +-
extras/ezio/ovs-switchui.c | 2 +-
secchan/in-band.c | 4 ++--
secchan/ofproto.c | 2 +-
utilities/ovs-controller.c | 6 +++---
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/datapath/datapath.c b/datapath/datapath.c
index aea8cc9..811b4ee 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -236,7 +236,7 @@ static int create_dp(int dp_idx, const char __user *devnamep)
if (!dp->table)
goto err_free_dp;
- /* Setup our datapath device */
+ /* Set up our datapath device. */
dp_dev = dp_dev_create(dp, devname, ODPP_LOCAL);
err = PTR_ERR(dp_dev);
if (IS_ERR(dp_dev))
diff --git a/extras/ezio/ovs-switchui.c b/extras/ezio/ovs-switchui.c
index e83367d..190caa9 100644
--- a/extras/ezio/ovs-switchui.c
+++ b/extras/ezio/ovs-switchui.c
@@ -1542,7 +1542,7 @@ menu(const struct dict *dict)
menu_add_item(&menu, "Exit");
menu_add_item(&menu, "Show Version")->f = cmd_show_version;
menu_add_item(&menu, "Configure")->f = cmd_configure;
- menu_add_item(&menu, "Setup PKI")->f = cmd_setup_pki;
+ menu_add_item(&menu, "Set up PKI")->f = cmd_setup_pki;
if (debug_mode) {
menu_add_item(&menu, "Browse Status")->f = cmd_browse_status;
menu_add_item(&menu, "Shell")->f = cmd_shell;
diff --git a/secchan/in-band.c b/secchan/in-band.c
index a2197c6..c24e32b 100644
--- a/secchan/in-band.c
+++ b/secchan/in-band.c
@@ -55,7 +55,7 @@
*
* In Open vSwitch, in-band control is implemented as "hidden" flows (in
* that they are not visible through OpenFlow) and at a higher priority
- * than wildcarded flows can be setup by the controller. This is done
+ * than wildcarded flows can be set up by the controller. This is done
* so that the controller cannot interfere with them and possibly break
* connectivity with its switches. It is possible to see all flows,
* including in-band ones, with the ovs-appctl "bridge/dump-flows"
@@ -182,7 +182,7 @@
*
* - Differing Controllers for Switches. All switches must know
* the L3 addresses for all the controllers that other switches
- * may use, since rules need to be setup to allow traffic related
+ * may use, since rules need to be set up to allow traffic related
* to those controllers through. See rules (f), (g), (h), and (i).
*
* - Differing Routes for Switches. In order for the switch to
diff --git a/secchan/ofproto.c b/secchan/ofproto.c
index 94c4bfe..6781335 100644
--- a/secchan/ofproto.c
+++ b/secchan/ofproto.c
@@ -2142,7 +2142,7 @@ xlate_actions(const union ofp_action *in, size_t n_in,
ctx.may_setup_flow = true;
do_xlate_actions(in, n_in, &ctx);
- /* Check with in-band control to see if we're allowed to setup this
+ /* Check with in-band control to see if we're allowed to set up this
* flow. */
if (!in_band_rule_check(ofproto->in_band, flow, out)) {
ctx.may_setup_flow = false;
diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c
index 314da18..30ab52d 100644
--- a/utilities/ovs-controller.c
+++ b/utilities/ovs-controller.c
@@ -53,7 +53,7 @@ struct switch_ {
static bool learn_macs = true;
/* Set up flows? (If not, every packet is processed at the controller.) */
-static bool setup_flows = true;
+static bool set_up_flows = true;
/* --max-idle: Maximum idle time, in seconds, before flows expire. */
static int max_idle = 60;
@@ -202,7 +202,7 @@ new_switch(struct switch_ *sw, struct vconn *vconn, const char *name)
{
sw->rconn = rconn_new_from_vconn(name, vconn);
sw->lswitch = lswitch_create(sw->rconn, learn_macs,
- setup_flows ? max_idle : -1);
+ set_up_flows ? max_idle : -1);
}
static int
@@ -268,7 +268,7 @@ parse_options(int argc, char *argv[])
break;
case 'n':
- setup_flows = false;
+ set_up_flows = false;
break;
case OPT_MUTE:
--
1.6.3.3
More information about the dev
mailing list