From: Ben Pfaff Date: Mon, 26 Oct 2009 21:41:32 +0000 (-0700) Subject: Spell verb form of "set up" correctly throughout the tree. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=inline;h=d6fbec6de043d5b9323a06417cc25b0fbba0ff8f;p=openvswitch Spell verb form of "set up" correctly throughout the tree. --- diff --git a/datapath/datapath.c b/datapath/datapath.c index aea8cc95..811b4ee9 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 e83367d0..7c360f37 100644 --- a/extras/ezio/ovs-switchui.c +++ b/extras/ezio/ovs-switchui.c @@ -1486,7 +1486,7 @@ static int menu_show(const struct menu *, int start, bool select); static void cmd_shell(const struct dict *); static void cmd_show_version(const struct dict *); static void cmd_configure(const struct dict *); -static void cmd_setup_pki(const struct dict *); +static void cmd_set_up_pki(const struct dict *); static void cmd_browse_status(const struct dict *); static void cmd_show_motto(const struct dict *); @@ -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_set_up_pki; if (debug_mode) { menu_add_item(&menu, "Browse Status")->f = cmd_browse_status; menu_add_item(&menu, "Shell")->f = cmd_shell; @@ -2886,7 +2886,7 @@ cmd_configure(const struct dict *dict UNUSED) } static void -cmd_setup_pki(const struct dict *dict UNUSED) +cmd_set_up_pki(const struct dict *dict UNUSED) { static const char def_privkey_file[] = "/etc/openflow-switch/of0-privkey.pem"; diff --git a/lib/timeval.c b/lib/timeval.c index 314b3f43..8ad8d060 100644 --- a/lib/timeval.c +++ b/lib/timeval.c @@ -43,7 +43,7 @@ static struct timeval now; /* Time at which to die with SIGALRM (if not TIME_MIN). */ static time_t deadline = TIME_MIN; -static void setup_timer(void); +static void set_up_timer(void); static void sigalrm_handler(int); static void refresh_if_ticked(void); static time_t time_add(time_t, time_t); @@ -78,11 +78,11 @@ time_init(void) } /* Set up periodic signal. */ - setup_timer(); + set_up_timer(); } static void -setup_timer(void) +set_up_timer(void) { struct itimerval itimer; @@ -102,7 +102,7 @@ setup_timer(void) void time_postfork(void) { - setup_timer(); + set_up_timer(); } /* Forces a refresh of the current time from the kernel. It is not usually diff --git a/secchan/in-band.c b/secchan/in-band.c index a2197c6a..c8f77796 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 @@ -337,8 +337,8 @@ drop_flow(struct in_band *in_band, int rule_idx) /* out_port and fixed_fields are assumed never to change. */ static void -setup_flow(struct in_band *in_band, int rule_idx, const flow_t *flow, - uint32_t fixed_fields, uint16_t out_port) +set_up_flow(struct in_band *in_band, int rule_idx, const flow_t *flow, + uint32_t fixed_fields, uint16_t out_port) { struct ib_rule *rule = &in_band->rules[rule_idx]; @@ -460,28 +460,28 @@ in_band_run(struct in_band *in_band) flow.nw_proto = IP_TYPE_UDP; flow.tp_src = htons(DHCP_CLIENT_PORT); flow.tp_dst = htons(DHCP_SERVER_PORT); - setup_flow(in_band, IBR_FROM_LOCAL_DHCP, &flow, - (OFPFW_IN_PORT | OFPFW_DL_TYPE | OFPFW_DL_SRC - | OFPFW_NW_PROTO | OFPFW_TP_SRC | OFPFW_TP_DST), - OFPP_NORMAL); + set_up_flow(in_band, IBR_FROM_LOCAL_DHCP, &flow, + (OFPFW_IN_PORT | OFPFW_DL_TYPE | OFPFW_DL_SRC + | OFPFW_NW_PROTO | OFPFW_TP_SRC | OFPFW_TP_DST), + OFPP_NORMAL); /* Allow the connection's interface to receive directed ARP traffic. */ memset(&flow, 0, sizeof flow); flow.dl_type = htons(ETH_TYPE_ARP); memcpy(flow.dl_dst, local_mac, ETH_ADDR_LEN); flow.nw_proto = ARP_OP_REPLY; - setup_flow(in_band, IBR_TO_LOCAL_ARP, &flow, - (OFPFW_DL_TYPE | OFPFW_DL_DST | OFPFW_NW_PROTO), - OFPP_NORMAL); + set_up_flow(in_band, IBR_TO_LOCAL_ARP, &flow, + (OFPFW_DL_TYPE | OFPFW_DL_DST | OFPFW_NW_PROTO), + OFPP_NORMAL); /* Allow the connection's interface to be the source of ARP traffic. */ memset(&flow, 0, sizeof flow); flow.dl_type = htons(ETH_TYPE_ARP); memcpy(flow.dl_src, local_mac, ETH_ADDR_LEN); flow.nw_proto = ARP_OP_REQUEST; - setup_flow(in_band, IBR_FROM_LOCAL_ARP, &flow, - (OFPFW_DL_TYPE | OFPFW_DL_SRC | OFPFW_NW_PROTO), - OFPP_NORMAL); + set_up_flow(in_band, IBR_FROM_LOCAL_ARP, &flow, + (OFPFW_DL_TYPE | OFPFW_DL_SRC | OFPFW_NW_PROTO), + OFPP_NORMAL); } else { drop_flow(in_band, IBR_TO_LOCAL_ARP); drop_flow(in_band, IBR_FROM_LOCAL_ARP); @@ -493,18 +493,18 @@ in_band_run(struct in_band *in_band) flow.dl_type = htons(ETH_TYPE_ARP); memcpy(flow.dl_dst, remote_mac, ETH_ADDR_LEN); flow.nw_proto = ARP_OP_REPLY; - setup_flow(in_band, IBR_TO_REMOTE_ARP, &flow, - (OFPFW_DL_TYPE | OFPFW_DL_DST | OFPFW_NW_PROTO), - OFPP_NORMAL); + set_up_flow(in_band, IBR_TO_REMOTE_ARP, &flow, + (OFPFW_DL_TYPE | OFPFW_DL_DST | OFPFW_NW_PROTO), + OFPP_NORMAL); /* Allow ARP requests from the remote side's MAC. */ memset(&flow, 0, sizeof flow); flow.dl_type = htons(ETH_TYPE_ARP); memcpy(flow.dl_src, remote_mac, ETH_ADDR_LEN); flow.nw_proto = ARP_OP_REQUEST; - setup_flow(in_band, IBR_FROM_REMOTE_ARP, &flow, - (OFPFW_DL_TYPE | OFPFW_DL_SRC | OFPFW_NW_PROTO), - OFPP_NORMAL); + set_up_flow(in_band, IBR_FROM_REMOTE_ARP, &flow, + (OFPFW_DL_TYPE | OFPFW_DL_SRC | OFPFW_NW_PROTO), + OFPP_NORMAL); } else { drop_flow(in_band, IBR_TO_REMOTE_ARP); drop_flow(in_band, IBR_FROM_REMOTE_ARP); @@ -516,18 +516,18 @@ in_band_run(struct in_band *in_band) flow.dl_type = htons(ETH_TYPE_ARP); flow.nw_proto = ARP_OP_REPLY; flow.nw_dst = controller_ip; - setup_flow(in_band, IBR_TO_CTL_ARP, &flow, - (OFPFW_DL_TYPE | OFPFW_NW_PROTO | OFPFW_NW_DST_MASK), - OFPP_NORMAL); + set_up_flow(in_band, IBR_TO_CTL_ARP, &flow, + (OFPFW_DL_TYPE | OFPFW_NW_PROTO | OFPFW_NW_DST_MASK), + OFPP_NORMAL); /* Allow ARP requests from the controller's IP. */ memset(&flow, 0, sizeof flow); flow.dl_type = htons(ETH_TYPE_ARP); flow.nw_proto = ARP_OP_REQUEST; flow.nw_src = controller_ip; - setup_flow(in_band, IBR_FROM_CTL_ARP, &flow, - (OFPFW_DL_TYPE | OFPFW_NW_PROTO | OFPFW_NW_SRC_MASK), - OFPP_NORMAL); + set_up_flow(in_band, IBR_FROM_CTL_ARP, &flow, + (OFPFW_DL_TYPE | OFPFW_NW_PROTO | OFPFW_NW_SRC_MASK), + OFPP_NORMAL); /* OpenFlow traffic to or from the controller. * @@ -541,12 +541,12 @@ in_band_run(struct in_band *in_band) flow.nw_dst = controller_ip; flow.tp_src = htons(OFP_TCP_PORT); flow.tp_dst = htons(OFP_TCP_PORT); - setup_flow(in_band, IBR_TO_CTL_OFP, &flow, - (OFPFW_DL_TYPE | OFPFW_NW_PROTO | OFPFW_NW_DST_MASK - | OFPFW_TP_DST), OFPP_NORMAL); - setup_flow(in_band, IBR_FROM_CTL_OFP, &flow, - (OFPFW_DL_TYPE | OFPFW_NW_PROTO | OFPFW_NW_SRC_MASK - | OFPFW_TP_SRC), OFPP_NORMAL); + set_up_flow(in_band, IBR_TO_CTL_OFP, &flow, + (OFPFW_DL_TYPE | OFPFW_NW_PROTO | OFPFW_NW_DST_MASK + | OFPFW_TP_DST), OFPP_NORMAL); + set_up_flow(in_band, IBR_FROM_CTL_OFP, &flow, + (OFPFW_DL_TYPE | OFPFW_NW_PROTO | OFPFW_NW_SRC_MASK + | OFPFW_TP_SRC), OFPP_NORMAL); } else { drop_flow(in_band, IBR_TO_CTL_ARP); drop_flow(in_band, IBR_FROM_CTL_ARP); diff --git a/secchan/ofproto.c b/secchan/ofproto.c index 94c4bfe3..2453055b 100644 --- a/secchan/ofproto.c +++ b/secchan/ofproto.c @@ -82,7 +82,7 @@ static int xlate_actions(const union ofp_action *in, size_t n_in, const flow_t *flow, struct ofproto *ofproto, const struct ofpbuf *packet, struct odp_actions *out, tag_type *tags, - bool *may_setup_flow); + bool *may_set_up_flow); struct rule { struct cls_rule cr; @@ -1919,7 +1919,7 @@ struct action_xlate_ctx { /* Output. */ struct odp_actions *out; /* Datapath actions. */ tag_type *tags; /* Tags associated with OFPP_NORMAL actions. */ - bool may_setup_flow; /* True ordinarily; false if the actions must + bool may_set_up_flow; /* True ordinarily; false if the actions must * be reassessed for every packet. */ }; @@ -2007,7 +2007,7 @@ xlate_output_action(struct action_xlate_ctx *ctx, ctx->out, ctx->tags, ctx->ofproto->aux)) { COVERAGE_INC(ofproto_uninstallable); - ctx->may_setup_flow = false; + ctx->may_set_up_flow = false; } break; case OFPP_FLOOD: @@ -2127,7 +2127,7 @@ static int xlate_actions(const union ofp_action *in, size_t n_in, const flow_t *flow, struct ofproto *ofproto, const struct ofpbuf *packet, - struct odp_actions *out, tag_type *tags, bool *may_setup_flow) + struct odp_actions *out, tag_type *tags, bool *may_set_up_flow) { tag_type no_tags = 0; struct action_xlate_ctx ctx; @@ -2139,17 +2139,17 @@ xlate_actions(const union ofp_action *in, size_t n_in, ctx.packet = packet; ctx.out = out; ctx.tags = tags ? tags : &no_tags; - ctx.may_setup_flow = true; + ctx.may_set_up_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; + ctx.may_set_up_flow = false; } - if (may_setup_flow) { - *may_setup_flow = ctx.may_setup_flow; + if (may_set_up_flow) { + *may_set_up_flow = ctx.may_set_up_flow; } if (odp_actions_overflow(out)) { odp_actions_init(out); diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c index 314da186..30ab52db 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: