[ovs-dev] [more wdp 2/3] Fix and improve comments.
Ben Pfaff
blp at nicira.com
Tue Jul 13 00:14:45 UTC 2010
---
include/openflow/openflow.h | 4 ++--
ofproto/ofproto.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/openflow/openflow.h b/include/openflow/openflow.h
index f84fd02..883ba13 100644
--- a/include/openflow/openflow.h
+++ b/include/openflow/openflow.h
@@ -556,7 +556,7 @@ enum ofp_flow_mod_flags {
OFPFF_SEND_FLOW_REM = 1 << 0, /* Send flow removed message when flow
* expires or is deleted. */
OFPFF_CHECK_OVERLAP = 1 << 1, /* Check for overlapping entries first. */
- OFPFF_EMERG = 1 << 2 /* Ramark this is for emergency. */
+ OFPFF_EMERG = 1 << 2 /* Put in emergency flow cache. */
};
/* Flow setup and teardown (controller -> datapath). */
@@ -576,7 +576,7 @@ struct ofp_flow_mod {
matching entries to include this as an
output port. A value of OFPP_NONE
indicates no restriction. */
- uint16_t flags; /* One of OFPFF_*. */
+ uint16_t flags; /* Zero or more of OFPFF_*. */
struct ofp_action_header actions[0]; /* The action length is inferred
from the length field in the
header. */
diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 7150d96..8ab2bec 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -184,7 +184,7 @@ struct ofproto {
struct fail_open *fail_open;
struct netflow *netflow;
struct ofproto_sflow *sflow;
- bool tun_id_from_cookie;
+ bool tun_id_from_cookie; /* NXT_TUN_ID_FROM_COOKIE enabled? */
/* In-band control. */
struct in_band *in_band;
@@ -2092,9 +2092,9 @@ modify_flows_loose(struct ofproto *p, struct ofconn *ofconn,
wdp_flow_for_each_match(p->wdp, &target, UINT_MAX,
modify_flows_cb, &cbdata);
if (cbdata.match) {
- /* This credits the packet to whichever flow happened to happened to
- * match last. That's weird. Maybe we should do a lookup for the
- * flow that actually matches the packet? Who knows. */
+ /* This credits the packet to whichever flow happened to match last.
+ * That's weird. Maybe we should do a lookup for the flow that
+ * actually matches the packet? Who knows. */
send_buffered_packet(p, ofconn, cbdata.match, ofm);
return 0;
} else {
--
1.7.1
More information about the dev
mailing list