From 898dcef1ccbe39efdc3c32a6b368c403c34bd3d1 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 3 Aug 2015 15:30:02 -0700 Subject: [PATCH] treewide: Fix doubled "the". Signed-off-by: Ben Pfaff Acked-by: Russell Bryant --- INSTALL.DPDK.md | 2 +- datapath-windows/ovsext/User.c | 2 +- datapath-windows/ovsext/Vport.c | 2 +- datapath-windows/ovsext/Vxlan.c | 2 +- lib/netdev-provider.h | 2 +- lib/ovs-atomic.h | 2 +- lib/packets.c | 2 +- ofproto/ofproto-provider.h | 2 +- tests/bfd.at | 2 +- utilities/ovs-ofctl.8.in | 2 +- utilities/ovs-vsctl.8.in | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/INSTALL.DPDK.md b/INSTALL.DPDK.md index 1287feac3..8563c4098 100644 --- a/INSTALL.DPDK.md +++ b/INSTALL.DPDK.md @@ -529,7 +529,7 @@ DPDK vhost-cuse VM configuration: subprocess.call("qemu-system-x86_64 .... -netdev tap,id=vhostnet0,\ vhost=on,vhostfd=" + fd +"...", shell=True) - Alternatively the the `qemu-wrap.py` script can be used to automate the + Alternatively the `qemu-wrap.py` script can be used to automate the requirements specified above and can be used in conjunction with libvirt if desired. See the "DPDK vhost VM configuration with QEMU wrapper" section below. diff --git a/datapath-windows/ovsext/User.c b/datapath-windows/ovsext/User.c index 9f462cf00..213e9c752 100644 --- a/datapath-windows/ovsext/User.c +++ b/datapath-windows/ovsext/User.c @@ -836,7 +836,7 @@ OvsGetUpcallMsgSize(PVOID userData, size += NlAttrTotalSize(userDataLen); } /* OVS_PACKET_ATTR_EGRESS_TUN_KEY */ - /* Is it included in the the flwo key attr XXX */ + /* Is it included in the flow key attr XXX */ if (tunnelKey) { size += NlAttrTotalSize(OvsTunKeyAttrSize()); } diff --git a/datapath-windows/ovsext/Vport.c b/datapath-windows/ovsext/Vport.c index b2ff3086d..65a413404 100644 --- a/datapath-windows/ovsext/Vport.c +++ b/datapath-windows/ovsext/Vport.c @@ -1417,7 +1417,7 @@ cleanup: * Deletes ports added from the Hyper-V switch as well as OVS usersapce. The * function deletes ports in 'portIdHashArray'. This will delete most of the * ports that are in the 'portNoHashArray' as well. Any remaining ports - * are deleted by walking the the 'portNoHashArray'. + * are deleted by walking the 'portNoHashArray'. * -------------------------------------------------------------------------- */ VOID diff --git a/datapath-windows/ovsext/Vxlan.c b/datapath-windows/ovsext/Vxlan.c index bcd2beb0b..2364f2868 100644 --- a/datapath-windows/ovsext/Vxlan.c +++ b/datapath-windows/ovsext/Vxlan.c @@ -410,7 +410,7 @@ OvsDecapVxlan(POVS_SWITCH_CONTEXT switchContext, PUINT8 bufferStart; NDIS_STATUS status; - /* Check the the length of the UDP payload */ + /* Check the length of the UDP payload */ curNb = NET_BUFFER_LIST_FIRST_NB(curNbl); packetLength = NET_BUFFER_DATA_LENGTH(curNb); tunnelSize = OvsGetVxlanTunHdrSize(); diff --git a/lib/netdev-provider.h b/lib/netdev-provider.h index eae1e6462..aab63b770 100644 --- a/lib/netdev-provider.h +++ b/lib/netdev-provider.h @@ -177,7 +177,7 @@ struct netdev *netdev_rxq_get_netdev(const struct netdev_rxq *); * not yet been uninitialized, so the "destruct" function may refer to it. The * "destruct" function is not allowed to fail. * - * Each "dealloc" function frees raw memory that was allocated by the the + * Each "dealloc" function frees raw memory that was allocated by the * "alloc" function. The memory's base and derived members might not have ever * been initialized (but if "construct" returned successfully, then it has been * "destruct"ed already). The "dealloc" function is not allowed to fail. diff --git a/lib/ovs-atomic.h b/lib/ovs-atomic.h index 9ead90779..b38c9ef4d 100644 --- a/lib/ovs-atomic.h +++ b/lib/ovs-atomic.h @@ -121,7 +121,7 @@ * operation (atomic_read_explicit, or a load operation preceding a * atomic_thread_fence) will not be moved prior to the consume * barrier. Non-data-dependent loads and stores can be reordered to - * happen before the the consume barrier. + * happen before the consume barrier. * * RCU is the prime example of the use of the consume barrier: The * consume barrier guarantees that reads from a RCU protected object diff --git a/lib/packets.c b/lib/packets.c index b37abde29..ca8d87cdf 100644 --- a/lib/packets.c +++ b/lib/packets.c @@ -294,7 +294,7 @@ set_mpls_lse(struct dp_packet *packet, ovs_be32 mpls_lse) } } -/* Push MPLS label stack entry 'lse' onto 'packet' as the the outermost MPLS +/* Push MPLS label stack entry 'lse' onto 'packet' as the outermost MPLS * header. If 'packet' does not already have any MPLS labels, then its * Ethertype is changed to 'ethtype' (which must be an MPLS Ethertype). */ void diff --git a/ofproto/ofproto-provider.h b/ofproto/ofproto-provider.h index 1fc500134..117cd1fcc 100644 --- a/ofproto/ofproto-provider.h +++ b/ofproto/ofproto-provider.h @@ -619,7 +619,7 @@ void ofproto_group_delete_all(struct ofproto *); * not yet been uninitialized, so the "destruct" function may refer to it. The * "destruct" function is not allowed to fail. * - * Each "dealloc" function frees raw memory that was allocated by the the + * Each "dealloc" function frees raw memory that was allocated by the * "alloc" function. The memory's base and derived members might not have ever * been initialized (but if "construct" returned successfully, then it has been * "destruct"ed already). The "dealloc" function is not allowed to fail. diff --git a/tests/bfd.at b/tests/bfd.at index 5215d2e9e..925af77a6 100644 --- a/tests/bfd.at +++ b/tests/bfd.at @@ -290,7 +290,7 @@ ovs-appctl time/warp 5000 500 BFD_CHECK_TX([p0], [500ms], [300ms], [500ms]) BFD_CHECK_RX([p0], [3000ms], [3000ms], [500ms]) -# advance clock by 5000ms and check the the flags are all 'none'. +# advance clock by 5000ms and check the flags are all 'none'. ovs-appctl time/warp 5000 500 BFD_CHECK([p0], [true], [false], [none], [up], [No Diagnostic], [none], [up], [No Diagnostic]) BFD_CHECK([p1], [true], [false], [none], [up], [No Diagnostic], [none], [up], [No Diagnostic]) diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in index 850fd767c..4181d821f 100644 --- a/utilities/ovs-ofctl.8.in +++ b/utilities/ovs-ofctl.8.in @@ -1413,7 +1413,7 @@ as necessary to match the value specified. Valid values are between 0 Strips the VLAN tag from a packet if it is present. . .IP \fBpush_vlan\fR:\fIethertype\fR -Push a new VLAN tag onto the packet. Ethertype is used as the the Ethertype +Push a new VLAN tag onto the packet. Ethertype is used as the Ethertype for the tag. Only ethertype 0x8100 should be used. (0x88a8 which the spec allows isn't supported at the moment.) A priority of zero and the tag of zero are used for the new tag. diff --git a/utilities/ovs-vsctl.8.in b/utilities/ovs-vsctl.8.in index 972fc2637..265ffde38 100644 --- a/utilities/ovs-vsctl.8.in +++ b/utilities/ovs-vsctl.8.in @@ -88,7 +88,7 @@ following forms: . .IP "\fB\-\-no\-wait\fR" Prevents \fBovs\-vsctl\fR from waiting for \fBovs\-vswitchd\fR to -reconfigure itself according to the the modified database. This +reconfigure itself according to the modified database. This option should be used if \fBovs\-vswitchd\fR is not running; otherwise, \fBovs\-vsctl\fR will not exit until \fBovs\-vswitchd\fR starts. -- 2.20.1