Skip to content

Commit

Permalink
Fix coding style and some typos.
Browse files Browse the repository at this point in the history
Fixes some lines exceeding 80 chars and a couple of typos.

Signed-off-by: Antonio Fischetti <antonio.fischetti@intel.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
  • Loading branch information
FischettiAntonio authored and blp committed Jul 11, 2017
1 parent 61c478a commit 1401f6d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion lib/conntrack.c
Expand Up @@ -1415,7 +1415,7 @@ extract_l4_icmp6(struct conn_key *key, const void *data, size_t size,
*
* If 'related' is not NULL and an ICMP error packet is being
* processed, the function will extract the key from the packet nested
* in the ICMP paylod and set '*related' to true.
* in the ICMP payload and set '*related' to true.
*
* If 'related' is NULL, it means that we're already parsing a header nested
* in an ICMP error. In this case, we skip checksum and length validation. */
Expand Down
6 changes: 4 additions & 2 deletions lib/dpctl.c
Expand Up @@ -1613,7 +1613,8 @@ static const struct dpctl_command all_commands[] = {
{ "set-if", "dp iface...", 2, INT_MAX, dpctl_set_if, DP_RW },
{ "dump-dps", "", 0, 0, dpctl_dump_dps, DP_RO },
{ "show", "[dp...]", 0, INT_MAX, dpctl_show, DP_RO },
{ "dump-flows", "[dp] [filter=..] [type=..]", 0, 3, dpctl_dump_flows, DP_RO },
{ "dump-flows", "[dp] [filter=..] [type=..]",
0, 3, dpctl_dump_flows, DP_RO },
{ "add-flow", "[dp] flow actions", 2, 3, dpctl_add_flow, DP_RW },
{ "mod-flow", "[dp] flow actions", 2, 3, dpctl_mod_flow, DP_RW },
{ "get-flow", "[dp] ufid", 1, 2, dpctl_get_flow, DP_RO },
Expand All @@ -1626,7 +1627,8 @@ static const struct dpctl_command all_commands[] = {

/* Undocumented commands for testing. */
{ "parse-actions", "actions", 1, INT_MAX, dpctl_parse_actions, DP_RO },
{ "normalize-actions", "actions", 2, INT_MAX, dpctl_normalize_actions, DP_RO },
{ "normalize-actions", "actions",
2, INT_MAX, dpctl_normalize_actions, DP_RO },

{ NULL, NULL, 0, 0, NULL, DP_RO },
};
Expand Down
2 changes: 1 addition & 1 deletion lib/dpif-netdev.c
Expand Up @@ -3021,7 +3021,7 @@ dpif_netdev_queue_to_priority(const struct dpif *dpif OVS_UNUSED,


/* Creates and returns a new 'struct dp_netdev_actions', whose actions are
* a copy of the 'ofpacts_len' bytes of 'ofpacts'. */
* a copy of the 'size' bytes of 'actions' input parameters. */
struct dp_netdev_actions *
dp_netdev_actions_create(const struct nlattr *actions, size_t size)
{
Expand Down
6 changes: 4 additions & 2 deletions utilities/ovs-dpctl.c
Expand Up @@ -196,8 +196,10 @@ usage(void *userdata OVS_UNUSED)
" get-flow [DP] ufid:UFID fetch flow corresponding to UFID\n"
" del-flow [DP] FLOW delete FLOW from DP\n"
" del-flows [DP] delete all flows from DP\n"
" dump-conntrack [DP] [zone=ZONE] display conntrack entries for ZONE\n"
" flush-conntrack [DP] [zone=ZONE] delete all conntrack entries in ZONE\n"
" dump-conntrack [DP] [zone=ZONE] " \
"display conntrack entries for ZONE\n"
" flush-conntrack [DP] [zone=ZONE] " \
"delete all conntrack entries in ZONE\n"
"Each IFACE on add-dp, add-if, and set-if may be followed by\n"
"comma-separated options. See ovs-dpctl(8) for syntax, or the\n"
"Interface table in ovs-vswitchd.conf.db(5) for an options list.\n"
Expand Down

0 comments on commit 1401f6d

Please sign in to comment.