From 5dca28b517a5a1699cebc228dab46218431f8616 Mon Sep 17 00:00:00 2001 From: Ethan Jackson Date: Fri, 14 Dec 2012 20:43:30 -0800 Subject: [PATCH] ovs: Replace TODO:XXX with XXX. According to the coding style, XXX is the appropriate tag for code that needs work. Signed-off-by: Ethan Jackson --- lib/jsonrpc.c | 2 +- lib/ofp-actions.c | 14 +++++++------- lib/ofp-actions.h | 4 ++-- lib/ofp-parse.c | 4 ++-- ofproto/ofproto-dpif.c | 8 ++++---- ovsdb/jsonrpc-server.c | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/jsonrpc.c b/lib/jsonrpc.c index 552de04c0..b0d8d340f 100644 --- a/lib/jsonrpc.c +++ b/lib/jsonrpc.c @@ -1102,7 +1102,7 @@ jsonrpc_session_set_dscp(struct jsonrpc_session *s, reconnect_get_name(s->reconnect), strerror(error)); } /* - * TODO:XXX race window between setting dscp to listening socket + * XXX race window between setting dscp to listening socket * and accepting socket. accepted socket may have old dscp value. * Ignore this race window for now. */ diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index 186275cd2..6468cacf8 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp-actions.c @@ -717,7 +717,7 @@ ofpact_from_openflow11(const union ofp_action *a, struct ofpbuf *out) case OFPUTIL_OFPAT11_PUSH_VLAN: if (((const struct ofp11_action_push *)a)->ethertype != htons(ETH_TYPE_VLAN_8021Q)) { - /* TODO:XXX 802.1AD(QinQ) isn't supported at the moment */ + /* XXX 802.1AD(QinQ) isn't supported at the moment */ return OFPERR_OFPBAC_BAD_ARGUMENT; } ofpact_put_PUSH_VLAN(out); @@ -1016,7 +1016,7 @@ ofpacts_pull_openflow11_instructions(struct ofpbuf *openflow, insts[OVSINST_OFPIT11_CLEAR_ACTIONS]); ofpact_put_CLEAR_ACTIONS(ofpacts); } - /* TODO:XXX Write-Actions */ + /* XXX Write-Actions */ if (insts[OVSINST_OFPIT11_WRITE_METADATA]) { const struct ofp11_instruction_write_metadata *oiwm; struct ofpact_metadata *om; @@ -1476,7 +1476,7 @@ ofpact_to_openflow10(const struct ofpact *a, struct ofpbuf *out) case OFPACT_PUSH_VLAN: case OFPACT_CLEAR_ACTIONS: case OFPACT_GOTO_TABLE: - /* TODO:XXX */ + /* XXX */ break; case OFPACT_CONTROLLER: @@ -1567,7 +1567,7 @@ ofpact_to_openflow11(const struct ofpact *a, struct ofpbuf *out) break; case OFPACT_PUSH_VLAN: - /* TODO:XXX ETH_TYPE_VLAN_8021AD case */ + /* XXX ETH_TYPE_VLAN_8021AD case */ ofputil_put_OFPAT11_PUSH_VLAN(out)->ethertype = htons(ETH_TYPE_VLAN_8021Q); break; @@ -1682,7 +1682,7 @@ ofpacts_put_openflow11_instructions(const struct ofpact ofpacts[], const struct ofpact *a; OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) { - /* TODO:XXX Write-Actions */ + /* XXX Write-Actions */ if (a->type == OFPACT_CLEAR_ACTIONS) { instruction_put_OFPIT11_CLEAR_ACTIONS(openflow); @@ -1924,7 +1924,7 @@ ofpact_format(const struct ofpact *a, struct ds *s) break; case OFPACT_PUSH_VLAN: - /* TODO:XXX 802.1AD case*/ + /* XXX 802.1AD case*/ ds_put_format(s, "push_vlan:%#"PRIx16, ETH_TYPE_VLAN_8021Q); break; @@ -2079,7 +2079,7 @@ ofpacts_format(const struct ofpact *ofpacts, size_t ofpacts_len, ds_put_cstr(string, ","); } - /* TODO:XXX write-actions */ + /* XXX write-actions */ ofpact_format(a, string); } } diff --git a/lib/ofp-actions.h b/lib/ofp-actions.h index b6cf4ba98..398904051 100644 --- a/lib/ofp-actions.h +++ b/lib/ofp-actions.h @@ -91,7 +91,7 @@ DEFINE_OFPACT(EXIT, ofpact_null, ofpact) \ \ /* Instructions */ \ - /* TODO:XXX Write-Actions */ \ + /* XXX Write-Actions */ \ DEFINE_OFPACT(WRITE_METADATA, ofpact_metadata, ofpact) \ DEFINE_OFPACT(CLEAR_ACTIONS, ofpact_null, ofpact) \ DEFINE_OFPACT(GOTO_TABLE, ofpact_goto_table, ofpact) @@ -595,7 +595,7 @@ enum { static inline bool ofpact_is_instruction(const struct ofpact *a) { - /* TODO:XXX Write-Actions */ + /* XXX Write-Actions */ return a->type == OFPACT_CLEAR_ACTIONS || a->type == OFPACT_WRITE_METADATA || a->type == OFPACT_GOTO_TABLE; diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c index 65f023a39..1d0ab85e8 100644 --- a/lib/ofp-parse.c +++ b/lib/ofp-parse.c @@ -428,7 +428,7 @@ parse_named_action(enum ofputil_action_code code, const struct flow *flow, case OFPUTIL_OFPAT11_PUSH_VLAN: ethertype = str_to_u16(arg, "ethertype"); if (ethertype != ETH_TYPE_VLAN_8021Q) { - /* TODO:XXXX ETH_TYPE_VLAN_8021AD case isn't supported */ + /* XXX ETH_TYPE_VLAN_8021AD case isn't supported */ ovs_fatal(0, "%s: not a valid VLAN ethertype", arg); } ofpact_put_PUSH_VLAN(ofpacts); @@ -629,7 +629,7 @@ parse_named_instruction(enum ovs_instruction_type type, break; case OVSINST_OFPIT11_WRITE_ACTIONS: - /* TODO:XXX */ + /* XXX */ ovs_fatal(0, "instruction write-actions is not supported yet"); break; diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 578e6d7db..d5d22d3dc 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -5468,7 +5468,7 @@ xlate_table_action(struct action_xlate_ctx *ctx, } if (rule == NULL && may_packet_in) { - /* TODO:XXX + /* XXX * check if table configuration flags * OFPTC_TABLE_MISS_CONTROLLER, default. * OFPTC_TABLE_MISS_CONTINUE, @@ -5934,7 +5934,7 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, break; case OFPACT_PUSH_VLAN: - /* TODO:XXX 802.1AD(QinQ) */ + /* XXX 802.1AD(QinQ) */ ctx->flow.vlan_tci = htons(VLAN_CFI); break; @@ -6040,7 +6040,7 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, break; case OFPACT_CLEAR_ACTIONS: - /* TODO:XXX + /* XXX * Nothing to do because writa-actions is not supported for now. * When writa-actions is supported, clear-actions also must * be supported at the same time. @@ -6054,7 +6054,7 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, break; case OFPACT_GOTO_TABLE: { - /* TODO:XXX remove recursion */ + /* XXX remove recursion */ /* It is assumed that goto-table is last action */ struct ofpact_goto_table *ogt = ofpact_get_GOTO_TABLE(a); assert(ctx->table_id < ogt->table_id); diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c index 1149efd64..8e1c030c3 100644 --- a/ovsdb/jsonrpc-server.c +++ b/ovsdb/jsonrpc-server.c @@ -532,7 +532,7 @@ ovsdb_jsonrpc_session_set_all_options( remote->dscp = options->dscp; } /* - * TODO:XXX race window between setting dscp to listening socket + * XXX race window between setting dscp to listening socket * and accepting socket. Accepted socket may have old dscp value. * Ignore this race window for now. */ -- 2.47.0