Signed-off-by: Ben Pfaff <b...@nicira.com>
---
include/openflow/openflow-1.1.h | 4 ++--
lib/ofp-util.c | 10 +++++-----
lib/ofp-util.h | 4 ++--
ofproto/bond.c | 2 +-
ofproto/ofproto-dpif.h | 4 ++--
tests/ofproto.at | 2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/include/openflow/openflow-1.1.h b/include/openflow/openflow-1.1.h
index 8b52b25..f44c18b 100644
--- a/include/openflow/openflow-1.1.h
+++ b/include/openflow/openflow-1.1.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2011, 2012, 2013 The Board of Trustees of The Leland
Stanford
+/* Copyright (c) 2008, 2011, 2012, 2013, 2014 The Board of Trustees of The
Leland Stanford
* Junior University
*
* We are making the OpenFlow specification and associated documentation
@@ -456,7 +456,7 @@ struct ofp11_flow_stats {
ovs_be64 cookie; /* Opaque controller-issued identifier. */
ovs_be64 packet_count; /* Number of packets in flow. */
ovs_be64 byte_count; /* Number of bytes in flow. */
- /* Open Flow version specific match */
+ /* OpenFlow version specific match */
/* struct ofp11_instruction instructions[0]; Instruction set. */
};
OFP_ASSERT(sizeof(struct ofp11_flow_stats) == 48);
diff --git a/lib/ofp-util.c b/lib/ofp-util.c
index 496dc40..d2f04d0 100644
--- a/lib/ofp-util.c
+++ b/lib/ofp-util.c
@@ -4071,7 +4071,7 @@ BUILD_ASSERT_DECL((int) OFPUTIL_C_ARP_MATCH_IP ==
OFPC_ARP_MATCH_IP);
static uint32_t
ofputil_capabilities_mask(enum ofp_version ofp_version)
{
- /* Handle capabilities whose bit is unique for all Open Flow versions */
+ /* Handle capabilities whose bit is unique for all OpenFlow versions */
switch (ofp_version) {
case OFP10_VERSION:
case OFP11_VERSION:
@@ -6450,7 +6450,7 @@ ofputil_parse_key_value(char **stringp, char **keyp, char
**valuep)
}
/* Encode a dump ports request for 'port', the encoded message
- * will be for Open Flow version 'ofp_version'. Returns message
+ * will be for OpenFlow version 'ofp_version'. Returns message
* as a struct ofpbuf. Returns encoded message on success, NULL on error */
struct ofpbuf *
ofputil_encode_dump_ports_request(enum ofp_version ofp_version, ofp_port_t
port)
@@ -8029,9 +8029,9 @@ ofputil_decode_queue_stats_request(const struct
ofp_header *request,
}
}
-/* Encode a queue statsrequest for 'oqsr', the encoded message
- * will be fore Open Flow version 'ofp_version'. Returns message
- * as a struct ofpbuf. Returns encoded message on success, NULL on error */
+/* Encode a queue stats request for 'oqsr', the encoded message
+ * will be for OpenFlow version 'ofp_version'. Returns message
+ * as a struct ofpbuf. Returns encoded message on success, NULL on error. */
struct ofpbuf *
ofputil_encode_queue_stats_request(enum ofp_version ofp_version,
const struct ofputil_queue_stats_request
*oqsr)
diff --git a/lib/ofp-util.h b/lib/ofp-util.h
index d85a255..405c95d 100644
--- a/lib/ofp-util.h
+++ b/lib/ofp-util.h
@@ -164,8 +164,8 @@ void ofputil_format_version_name(struct ds *, enum
ofp_version);
/* A bitmap of version numbers
*
* Bit offsets correspond to ofp_version numbers which in turn correspond to
- * wire-protocol numbers for Open Flow versions.. E.g. (1u << OFP11_VERSION)
- * is the mask for Open Flow 1.1. If the bit for a version is set then it is
+ * wire-protocol numbers for OpenFlow versions, e.g. (1u << OFP11_VERSION)
+ * is the mask for OpenFlow 1.1. If the bit for a version is set then it is
* allowed, otherwise it is disallowed. */
void ofputil_format_version_bitmap(struct ds *msg, uint32_t bitmap);
diff --git a/ofproto/bond.c b/ofproto/bond.c
index b487bf4..372f481 100644
--- a/ofproto/bond.c
+++ b/ofproto/bond.c
@@ -83,7 +83,7 @@ struct bond_slave {
struct netdev *netdev; /* Network device, owned by the client. */
unsigned int change_seq; /* Tracks changes in 'netdev'. */
- ofp_port_t ofp_port; /* Open flow port number */
+ ofp_port_t ofp_port; /* OpenFlow port number. */
char *name; /* Name (a copy of netdev_get_name(netdev)). */
/* Link status. */
diff --git a/ofproto/ofproto-dpif.h b/ofproto/ofproto-dpif.h
index 77ae8f0..c06db20 100644
--- a/ofproto/ofproto-dpif.h
+++ b/ofproto/ofproto-dpif.h
@@ -178,13 +178,13 @@ struct ofport_dpif *odp_port_to_ofport(const struct
dpif_backer *, odp_port_t);
* nested, data path implementation limits the number of recirculation executed
* to prevent unreasonable nesting depth or infinite loop.
*
- * Both flow fields and the RECIRC action are exposed as open flow fields via
+ * Both flow fields and the RECIRC action are exposed as OpenFlow fields via
* Nicira extensions.
*
* Post recirculation flow
* ------------------------
*
- * At the open flow level, post recirculation rules are always hidden from the
+ * At the OpenFlow level, post recirculation rules are always hidden from the
* controller. They are installed in table 254 which is set up as a hidden
* table during boot time. Those rules are managed by the local user space
* program only.
diff --git a/tests/ofproto.at b/tests/ofproto.at
index 720ceb7..210b933 100644
--- a/tests/ofproto.at
+++ b/tests/ofproto.at
@@ -1537,7 +1537,7 @@ AT_CHECK([ovs-ofctl -O OpenFlow12 dump-flows br0 |
ofctl_strip | sort], [0], [dn
in_port=5 actions=drop
OFPST_FLOW reply (OF1.2):
])
-# In Open Flow 1.2 a mod-flow does not ever add a flow and thus
+# In OpenFlow 1.2 a mod-flow does not ever add a flow and thus
# has no effect on eviction
AT_CHECK([ovs-ofctl -O OpenFlow12 mod-flows br0 in_port=6,actions=drop])
AT_CHECK([ovs-ofctl -O OpenFlow12 add-flow br0 in_port=4,actions=normal])
--
1.7.10.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
