treewide: Fix spelling of "prerequisites".

Signed-off-by: Ben Pfaff <[email protected]> Acked-by: Greg Rose <[email protected]>
wanlebing · Jun 12, 2017 · 5bcd475 · 5bcd475
1 parent 7df14f8
commit 5bcd475
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/lib/nx-match.c b/lib/nx-match.c
@@ -625,7 +625,7 @@ nx_pull_match(struct ofpbuf *b, unsigned int match_len, struct match *match,
 
 /* Behaves the same as nx_pull_match(), but skips over unknown NXM headers,
  * instead of failing with an error, and does not check for field
- * prerequisities. */
+ * prerequisites. */
 enum ofperr
 nx_pull_match_loose(struct ofpbuf *b, unsigned int match_len,
                     struct match *match, ovs_be64 *cookie,
@@ -695,7 +695,7 @@ oxm_pull_match(struct ofpbuf *b, bool pipeline_fields_only,
 
 /* Behaves the same as oxm_pull_match() with two exceptions.  Skips over
  * unknown OXM headers instead of failing with an error when they are
- * encountered, and does not check for field prerequisities. */
+ * encountered, and does not check for field prerequisites. */
 enum ofperr
 oxm_pull_match_loose(struct ofpbuf *b, bool pipeline_fields_only,
                      const struct tun_table *tun_table, struct match *match)

diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c
@@ -7616,7 +7616,7 @@ ofpact_check__(enum ofputil_protocol *usable_protocols, struct ofpact *a,
         if (!mf_are_prereqs_ok(mf, flow, NULL) ||
             (mf->id == MFF_VLAN_VID &&
              !(flow->vlans[0].tci & htons(VLAN_CFI)))) {
-            VLOG_WARN_RL(&rl, "set_field %s lacks correct prerequisities",
+            VLOG_WARN_RL(&rl, "set_field %s lacks correct prerequisites",
                          mf->name);
             return OFPERR_OFPBAC_MATCH_INCONSISTENT;
         }

diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
@@ -3899,7 +3899,7 @@ xlate_hash_fields_select_group(struct xlate_ctx *ctx, struct group_dpif *group)
     BITMAP_FOR_EACH_1 (i, MFF_N_IDS, fields->used.bm) {
         const struct mf_field *mf = mf_from_id(i);
 
-        /* Skip fields for which prerequisities are not met. */
+        /* Skip fields for which prerequisites are not met. */
         if (!mf_are_prereqs_ok(mf, &ctx->xin->flow, ctx->wc)) {
             /* Skip the mask bytes for this field. */
             mask_values += mf->n_bytes;

diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
@@ -4092,25 +4092,25 @@ ovs-ofctl: actions are invalid with specified match (OFPBAC_MATCH_INCONSISTENT)
 
 AT_CHECK([ovs-ofctl add-flow br0 "udp,ip_frag=later actions=set_field:8888->udp_src,output:1"], [1], [], [stderr])
 AT_CHECK([tail -2 stderr | sed 's/^.*|WARN|//'], [0], [dnl
-set_field udp_src lacks correct prerequisities
+set_field udp_src lacks correct prerequisites
 ovs-ofctl: actions are invalid with specified match (OFPBAC_MATCH_INCONSISTENT)
 ])
 
 AT_CHECK([ovs-ofctl add-flow br0 "udp,ip_frag=later actions=load:8888->NXM_OF_UDP_DST[[]],output:1"], [1], [], [stderr])
 AT_CHECK([tail -2 stderr | sed 's/^.*|WARN|//'], [0], [dnl
-set_field udp_dst lacks correct prerequisities
+set_field udp_dst lacks correct prerequisites
 ovs-ofctl: actions are invalid with specified match (OFPBAC_MATCH_INCONSISTENT)
 ])
 
 AT_CHECK([ovs-ofctl add-flow br0 "sctp,ip_frag=later actions=set_field:8888->sctp_src,output:1"], [1], [], [stderr])
 AT_CHECK([tail -2 stderr | sed 's/^.*|WARN|//'], [0], [dnl
-set_field sctp_src lacks correct prerequisities
+set_field sctp_src lacks correct prerequisites
 ovs-ofctl: actions are invalid with specified match (OFPBAC_MATCH_INCONSISTENT)
 ])
 
 AT_CHECK([ovs-ofctl add-flow br0 "sctp,ip_frag=later actions=set_field:8888->sctp_dst,output:1"], [1], [], [stderr])
 AT_CHECK([tail -2 stderr | sed 's/^.*|WARN|//'], [0], [dnl
-set_field sctp_dst lacks correct prerequisities
+set_field sctp_dst lacks correct prerequisites
 ovs-ofctl: actions are invalid with specified match (OFPBAC_MATCH_INCONSISTENT)
 ])