diff --git a/AUTHORS b/AUTHORS index d15173ea4e2..c0c5a72fdb4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -6,6 +6,7 @@ Alexey I. Froloff raorn@altlinux.org Alex Wang alexw@nicira.com Andrew Evans aevans@nicira.com Andrew Lambeth wal@nicira.com +Andy Hill hillad@gmail.com Andy Southgate andy.southgate@citrix.com Andy Zhou azhou@nicira.com Ansis Atteka aatteka@nicira.com diff --git a/README-lisp b/README-lisp index e0e1ffd12e1..6057706aeec 100644 --- a/README-lisp +++ b/README-lisp @@ -34,7 +34,7 @@ Unix based VMs), or have the hypervisor do proxy ARP. On the receiving side, the packet arrives without the original MAC header. The LISP tunneling code attaches a header with harcoded source and destination -MAC addres 02:00:00:00:00:00. This address has all bits set to 0, except the +MAC address 02:00:00:00:00:00. This address has all bits set to 0, except the locally administered bit, in order to avoid potential collisions with existing allocations. In order for packets to reach their intended destination, the destination MAC address needs to be rewritten. This can be done using the diff --git a/datapath/vport.c b/datapath/vport.c index 745ffe44689..dcb7616531f 100644 --- a/datapath/vport.c +++ b/datapath/vport.c @@ -407,7 +407,7 @@ int ovs_vport_send(struct vport *vport, struct sk_buff *skb) * @err_type: one of enum vport_err_type types to indicate the error type * * If using the vport generic stats layer indicate that an error of the given - * type has occured. + * type has occurred. */ void ovs_vport_record_error(struct vport *vport, enum vport_err_type err_type) { diff --git a/lib/cfm.c b/lib/cfm.c index 4d4ebcbd944..64ad18cfa81 100644 --- a/lib/cfm.c +++ b/lib/cfm.c @@ -92,9 +92,9 @@ struct cfm { bool check_tnl_key; /* Verify the tunnel key of inbound packets? */ bool extended; /* Extended mode. */ bool demand; /* Demand mode. */ - bool booted; /* A full fault interval has occured. */ + bool booted; /* A full fault interval has occurred. */ enum cfm_fault_reason fault; /* Connectivity fault status. */ - enum cfm_fault_reason recv_fault; /* Bit mask of faults occuring on + enum cfm_fault_reason recv_fault; /* Bit mask of faults occurring on receive. */ bool opup; /* Operational State. */ bool remote_opup; /* Remote Operational State. */ diff --git a/lib/netdev-provider.h b/lib/netdev-provider.h index 2d43431f1bc..137b6597c43 100644 --- a/lib/netdev-provider.h +++ b/lib/netdev-provider.h @@ -470,7 +470,7 @@ struct netdev_class { * anyhow. */ int (*add_router)(struct netdev *netdev, struct in_addr router); - /* Looks up the next hop for 'host'. If succesful, stores the next hop + /* Looks up the next hop for 'host'. If successful, stores the next hop * gateway's address (0 if 'host' is on a directly connected network) in * '*next_hop' and a copy of the name of the device to reach 'host' in * '*netdev_name', and returns 0. The caller is responsible for freeing diff --git a/lib/netlink-notifier.c b/lib/netlink-notifier.c index 6739eceec8f..1e1a317b5ea 100644 --- a/lib/netlink-notifier.c +++ b/lib/netlink-notifier.c @@ -41,7 +41,7 @@ struct nln { /* Passed in by nln_create(). */ int multicast_group; /* Multicast group we listen on. */ - int protocol; /* Protocal passed to nl_sock_create(). */ + int protocol; /* Protocol passed to nl_sock_create(). */ nln_parse_func *parse; /* Message parsing function. */ void *change; /* Change passed to parse. */ }; diff --git a/lib/nx-match.c b/lib/nx-match.c index a91d56b9aa4..e111000fc7b 100644 --- a/lib/nx-match.c +++ b/lib/nx-match.c @@ -280,7 +280,7 @@ oxm_pull_match__(struct ofpbuf *b, bool strict, struct match *match) strict, match, NULL, NULL); } -/* Parses the oxm formatted match description preceeded by a struct ofp11_match +/* Parses the oxm formatted match description preceded by a struct ofp11_match * in 'b' with length 'match_len'. Stores the result in 'match'. * * Fails with an error when encountering unknown OXM headers. diff --git a/lib/odp-util.c b/lib/odp-util.c index 1c48e7b7b9f..030ad5e5a2f 100644 --- a/lib/odp-util.c +++ b/lib/odp-util.c @@ -1997,7 +1997,7 @@ parse_8021q_onward(const struct nlattr *attrs[OVS_KEY_ATTR_MAX + 1], enum odp_key_fitness fitness; ovs_be16 tci; - /* Calulate fitness of outer attributes. */ + /* Calculate fitness of outer attributes. */ expected_attrs |= ((UINT64_C(1) << OVS_KEY_ATTR_VLAN) | (UINT64_C(1) << OVS_KEY_ATTR_ENCAP)); fitness = check_expectations(present_attrs, out_of_range_attr, @@ -2449,7 +2449,7 @@ commit_odp_actions(const struct flow *flow, struct flow *base, commit_vlan_action(flow, base, odp_actions); commit_set_nw_action(flow, base, odp_actions); commit_set_port_action(flow, base, odp_actions); - /* Commiting MPLS actions should occur after committing nw and port + /* Committing MPLS actions should occur after committing nw and port * actions. This is because committing MPLS actions may alter a packet so * that it is no longer IP and thus nw and port actions are no longer valid. */ diff --git a/lib/stream-ssl.c b/lib/stream-ssl.c index ddf65a325c8..5caac497538 100644 --- a/lib/stream-ssl.c +++ b/lib/stream-ssl.c @@ -442,7 +442,7 @@ ssl_connect(struct stream *stream) case STATE_SSL_CONNECTING: /* Capture the first few bytes of received data so that we can guess - * what kind of funny data we've been sent if SSL negotation fails. */ + * what kind of funny data we've been sent if SSL negotiation fails. */ if (sslv->n_head <= 0) { sslv->n_head = recv(sslv->fd, sslv->head, sizeof sslv->head, MSG_PEEK); diff --git a/lib/stress.h b/lib/stress.h index 498deefeeb0..8f3d359cef2 100644 --- a/lib/stress.h +++ b/lib/stress.h @@ -53,7 +53,7 @@ struct stress_option { * * DEFAULT is the default value for the option. Specify 0 to disable the * option by default, which should be the usual choice. But some options can - * be left on at low levels without noticable impact to the end user. An + * be left on at low levels without noticeable impact to the end user. An * example would be failing to allocate a buffer for every 100000th packet * processed by the system. */ diff --git a/lib/unixctl.c b/lib/unixctl.c index 104a2d9a3a3..3d5eda60598 100644 --- a/lib/unixctl.c +++ b/lib/unixctl.c @@ -168,7 +168,7 @@ unixctl_command_reply(struct unixctl_conn *conn, const char *result) } /* Replies to the active unixctl connection 'conn'. 'error' is sent to the - * client indicating an error occured processing the command. Only one call to + * client indicating an error occurred processing the command. Only one call to * unixctl_command_reply() or unixctl_command_reply_error() may be made per * request. */ void diff --git a/lib/vconn.c b/lib/vconn.c index 71e6d05244a..dc84cbb75c0 100644 --- a/lib/vconn.c +++ b/lib/vconn.c @@ -754,7 +754,7 @@ vconn_recv_block(struct vconn *vconn, struct ofpbuf **msgp) return retval; } -/* Waits until a message with a transaction ID matching 'xid' is recived on +/* Waits until a message with a transaction ID matching 'xid' is received on * 'vconn'. Returns 0 if successful, in which case the reply is stored in * '*replyp' for the caller to examine and free. Otherwise returns a positive * errno value, or EOF, and sets '*replyp' to null. diff --git a/ofproto/netflow.c b/ofproto/netflow.c index aec39685af5..7366986f65c 100644 --- a/ofproto/netflow.c +++ b/ofproto/netflow.c @@ -41,8 +41,8 @@ struct netflow { uint8_t engine_id; /* Value of engine_id to use. */ long long int boot_time; /* Time when netflow_create() was called. */ struct collectors *collectors; /* NetFlow collectors. */ - bool add_id_to_iface; /* Put the 7 least signficiant bits of - * 'engine_id' into the most signficant + bool add_id_to_iface; /* Put the 7 least significiant bits of + * 'engine_id' into the most significant * bits of the interface fields. */ uint32_t netflow_cnt; /* Flow sequence number for NetFlow. */ struct ofpbuf packet; /* NetFlow packet being accumulated. */ diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 13e2aad3e1a..2307577a600 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -3819,7 +3819,7 @@ handle_flow_miss(struct flow_miss *miss, struct flow_miss_op *ops, * flow keys with fitness ODP_FIT_TO_LITTLE. This breaks a fundamental * assumption used throughout the facet and subfacet handling code. * Since we have to handle these misses in userspace anyway, we simply - * skip facet creation, avoiding the problem alltogether. */ + * skip facet creation, avoiding the problem altogether. */ if (miss->key_fitness == ODP_FIT_TOO_LITTLE || !flow_miss_should_make_facet(ofproto, miss, hash)) { handle_flow_miss_without_facet(miss, ops, n_ops); diff --git a/ovsdb/table.c b/ovsdb/table.c index 0d4f522754a..e7545ad3121 100644 --- a/ovsdb/table.c +++ b/ovsdb/table.c @@ -230,7 +230,7 @@ ovsdb_table_schema_from_json(const struct json *json, const char *name, * The "isRoot" member is included in the JSON only if its value would differ * from 'default_is_root'. Ordinarily 'default_is_root' should be false, * because ordinarily a table would be not be part of the root set if its - * "isRoot" member is omitted. However, garbage collection was not orginally + * "isRoot" member is omitted. However, garbage collection was not originally * included in OVSDB, so in older schemas that do not include any "isRoot" * members, every table is implicitly part of the root set. To serialize such * a schema in a way that can be read by older OVSDB tools, specify diff --git a/python/ovs/db/data.py b/python/ovs/db/data.py index 55e7a732b33..e21a1ccfaaa 100644 --- a/python/ovs/db/data.py +++ b/python/ovs/db/data.py @@ -468,7 +468,7 @@ def from_python(type_, value, row_to_uuid): new datum's value is taken from 'value', which must take the form described as a valid return value from Datum.to_python() for 'type'. - Each scalar value within 'value' is initally passed through + Each scalar value within 'value' is initially passed through 'row_to_uuid', which should convert objects that represent rows (if any) into uuid.UUID objects and return other data unchanged. diff --git a/python/ovs/db/schema.py b/python/ovs/db/schema.py index 1b5a771f771..bc86232f9c9 100644 --- a/python/ovs/db/schema.py +++ b/python/ovs/db/schema.py @@ -217,7 +217,7 @@ def to_json(self, default_is_root=False): differ from 'default_is_root'. Ordinarily 'default_is_root' should be false, because ordinarily a table would be not be part of the root set if its "isRoot" member is omitted. However, garbage collection was not - orginally included in OVSDB, so in older schemas that do not include + originally included in OVSDB, so in older schemas that do not include any "isRoot" members, every table is implicitly part of the root set. To serialize such a schema in a way that can be read by older OVSDB tools, specify 'default_is_root' as True. diff --git a/xenserver/opt_xensource_libexec_InterfaceReconfigure.py b/xenserver/opt_xensource_libexec_InterfaceReconfigure.py index 22af3c2249f..f37e038635d 100644 --- a/xenserver/opt_xensource_libexec_InterfaceReconfigure.py +++ b/xenserver/opt_xensource_libexec_InterfaceReconfigure.py @@ -923,7 +923,7 @@ def configure(self): Should assume any configuration files changed attached in the preconfigure stage are applied and bring up the - necesary devices to provide the datapath for the + necessary devices to provide the datapath for the PIF. Should not bring up the IPdev. diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure index 72bd5e4a926..3b5c8617aec 100755 --- a/xenserver/opt_xensource_libexec_interface-reconfigure +++ b/xenserver/opt_xensource_libexec_interface-reconfigure @@ -242,7 +242,7 @@ def ipdev_configure_static_routes(interface, oc, f): 172.18.0.0/16 via 192.168.0.4 dev xenbr1 """ if oc.has_key('static-routes'): - # The key is present - extract comma seperates entries + # The key is present - extract comma separates entries lines = oc['static-routes'].split(',') else: # The key is not present, i.e. there are no static routes