diff options
38 files changed, 73 insertions, 73 deletions
diff --git a/sys/netgraph/atm/ng_atm.c b/sys/netgraph/atm/ng_atm.c index c0a703259b71..e06cb1d02036 100644 --- a/sys/netgraph/atm/ng_atm.c +++ b/sys/netgraph/atm/ng_atm.c @@ -1343,7 +1343,7 @@ ng_atm_shutdown(node_p node) } #else /* - * We are persistant - reinitialize + * We are persistent - reinitialize. */ NG_NODE_REVIVE(node); #endif diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c index 4121ebc07f19..400616ab48f0 100644 --- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c +++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c @@ -58,7 +58,7 @@ * 2) Netgraph context. This is where all the Netgraph related stuff happens. * Since we mark node as WRITER, the Netgraph node will be "locked" (from * Netgraph point of view). Any variable that is only modified from the - * Netgraph context does not require any additonal locking. It is generally + * Netgraph context does not require any additional locking. It is generally * *NOT* allowed to grab *ANY* additional locks. Whatever you do, *DO NOT* * grab any lock in the Netgraph context that could cause de-scheduling of * the Netgraph thread for significant amount of time. In fact, the only @@ -1463,7 +1463,7 @@ ng_ubt_shutdown(node_p node) if (node->nd_flags & NGF_REALLY_DIE) { /* * We came here because the USB device is being - * detached, so stop being persistant. + * detached, so stop being persistent. */ NG_NODE_SET_PRIVATE(node, NULL); NG_NODE_UNREF(node); diff --git a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c index 0edb44cd5365..4208a2c3914d 100644 --- a/sys/netgraph/bluetooth/hci/ng_hci_cmds.c +++ b/sys/netgraph/bluetooth/hci/ng_hci_cmds.c @@ -369,7 +369,7 @@ complete_command(ng_hci_unit_p unit, int opcode, struct mbuf **cp) * and return command parameters. ng_hci_command_untimeout will * drop NG_HCI_UNIT_COMMAND_PENDING flag. * Note: if ng_hci_command_untimeout() fails (returns non-zero) - * then timeout aready happened and timeout message went info node + * then timeout already happened and timeout message went info node * queue. In this case we ignore command completion and pretend * there is a timeout. */ diff --git a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h index fdc1d00cbe6e..c42cf4f77975 100644 --- a/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h +++ b/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h @@ -69,7 +69,7 @@ #define RFCOMM_MODEM_FC 0x02 /* Flow Control asserted */ #define RFCOMM_MODEM_RTC 0x04 /* Ready To Communicate */ #define RFCOMM_MODEM_RTR 0x08 /* Ready To Receive */ -#define RFCOMM_MODEM_IC 0x40 /* Incomming Call */ +#define RFCOMM_MODEM_IC 0x40 /* Incoming Call */ #define RFCOMM_MODEM_DV 0x80 /* Data Valid */ /* RPN parameters - baud rate */ @@ -270,7 +270,7 @@ struct ng_btsocket_rfcomm_pcb { u_int16_t flags; /* DLC flags */ #define NG_BTSOCKET_RFCOMM_DLC_TIMO (1 << 0) /* timeout pending */ #define NG_BTSOCKET_RFCOMM_DLC_CFC (1 << 1) /* credit flow ctrl */ -#define NG_BTSOCKET_RFCOMM_DLC_TIMEDOUT (1 << 2) /* timeout happend */ +#define NG_BTSOCKET_RFCOMM_DLC_TIMEDOUT (1 << 2) /* timeout happened */ #define NG_BTSOCKET_RFCOMM_DLC_DETACHED (1 << 3) /* DLC detached */ #define NG_BTSOCKET_RFCOMM_DLC_SENDING (1 << 4) /* send pending */ diff --git a/sys/netgraph/bluetooth/include/ng_hci.h b/sys/netgraph/bluetooth/include/ng_hci.h index 40d6a79598f8..7fe1dc7a6f0b 100644 --- a/sys/netgraph/bluetooth/include/ng_hci.h +++ b/sys/netgraph/bluetooth/include/ng_hci.h @@ -1560,7 +1560,7 @@ typedef struct { u_int16_t min_ce_length; u_int16_t max_ce_length; }__attribute__((packed)) ng_hci_le_create_connection_cp; -/* no return paramters*/ +/* No return parameters. */ #define NG_HCI_OCF_LE_CREATE_CONNECTION_CANCEL 0x000e /*No command parameter*/ typedef ng_hci_status_rp ng_hci_le_create_connection_cancel_rp; @@ -1572,7 +1572,7 @@ typedef struct { } __attribute__ ((packed)) ng_hci_le_read_white_list_size_rp; #define NG_HCI_OCF_LE_CLEAR_WHITE_LIST 0x0010 -/*No command paramters*/ +/* No command parameters. */ typedef ng_hci_status_rp ng_hci_le_clear_white_list_rp; #define NG_HCI_OCF_LE_ADD_DEVICE_TO_WHITE_LIST 0x0011 typedef struct { @@ -1689,7 +1689,7 @@ typedef struct{ typedef ng_hci_status_rp ng_hci_le_transmitter_test_rp; #define NG_HCI_OCF_LE_TEST_END 0x001f -/*No command paramter*/ +/* No command parameter. */ typedef struct { u_int8_t status; u_int16_t number_of_packets; diff --git a/sys/netgraph/bluetooth/include/ng_l2cap.h b/sys/netgraph/bluetooth/include/ng_l2cap.h index 8a72e3d8837e..ffe6a959adde 100644 --- a/sys/netgraph/bluetooth/include/ng_l2cap.h +++ b/sys/netgraph/bluetooth/include/ng_l2cap.h @@ -385,7 +385,7 @@ typedef struct { bdaddr_t bdaddr; /* remote unit address */ u_int16_t lcid; /* local channel ID */ u_int16_t psm; /* Procotol/Service Multiplexor */ - u_int8_t ident; /* indentifier */ + u_int8_t ident; /* identifier */ u_int8_t linktype; /* link type*/ } ng_l2cap_l2ca_con_ind_ip; /* No output parameters */ @@ -688,7 +688,7 @@ typedef struct { u_int16_t scid; /* source (local) channel ID */ u_int16_t dcid; /* destination (remote) channel ID */ - u_int16_t imtu; /* incomming MTU */ + u_int16_t imtu; /* incoming MTU */ u_int16_t omtu; /* outgoing MTU */ u_int16_t psm; /* PSM */ diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c index 167fcb6b917f..c13a2af7569c 100644 --- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c +++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c @@ -332,7 +332,7 @@ ng_l2cap_con_fail(ng_l2cap_con_p con, u_int16_t result) /* * Process L2CAP command timeout. In general - notify upper layer and destroy - * channel. Do not pay much attension to return code, just do our best. + * channel. Do not pay much attention to return code, just do our best. */ void diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c index 7429f78f95c6..11ef3119a42f 100644 --- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c +++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c @@ -358,7 +358,7 @@ ng_l2cap_process_lesignal_cmd(ng_l2cap_con_p con) /*Update Paramater Request*/ static int ng_l2cap_process_cmd_urq(ng_l2cap_con_p con, uint8_t ident) { - /*We do not implement paramter negotiasion for now*/ + /* We do not implement parameter negotiation for now. */ send_l2cap_param_urs(con, ident, NG_L2CAP_UPDATE_PARAM_ACCEPT); NG_FREE_M(con->rx_pkt); return 0; @@ -1068,7 +1068,7 @@ ng_l2cap_process_discon_rsp(ng_l2cap_con_p con, u_int8_t ident) } /* - * Looks like we have successfuly disconnected channel, so notify + * Looks like we have successfully disconnected channel, so notify * upper layer. If command timeout already happened then ignore * response. */ diff --git a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c index 889f6ab3a66d..f80a7b02d4c6 100644 --- a/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c +++ b/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c @@ -325,7 +325,7 @@ ng_l2cap_con_by_handle(ng_l2cap_p l2cap, u_int16_t con_handle) } /* ng_l2cap_con_by_handle */ /* - * Allocate new L2CAP channel descriptor on "con" conection with "psm". + * Allocate new L2CAP channel descriptor on "con" connection with "psm". * Will link the channel to the l2cap node */ diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c index 57628b0e6b90..765326343dc8 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c @@ -2076,7 +2076,7 @@ ng_btsocket_l2cap_attach(struct socket *so, int proto, struct thread *td) * This is totally FUBAR. We could get here in two cases: * * 1) When user calls socket() - * 2) When we need to accept new incomming connection and call + * 2) When we need to accept new incoming connection and call * sonewconn() * * In the first case we must acquire ng_btsocket_l2cap_sockets_mtx. @@ -2610,7 +2610,7 @@ ng_btsocket_l2cap_send(struct socket *so, int flags, struct mbuf *m, goto drop; } - /* Check packet size agains outgoing (peer's incoming) MTU) */ + /* Check packet size against outgoing (peer's incoming) MTU) */ if (m->m_pkthdr.len > pcb->omtu) { NG_BTSOCKET_L2CAP_ERR( "%s: Packet too big, len=%d, omtu=%d\n", __func__, m->m_pkthdr.len, pcb->omtu); @@ -2690,7 +2690,7 @@ ng_btsocket_l2cap_send2(ng_btsocket_l2cap_pcb_p pcb) hdr->token, pcb->state); /* - * If we got here than we have successfuly creates new L2CAP + * If we got here than we have successfully creates new L2CAP * data packet and now we can send it to the L2CAP layer */ diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c index 68c5975c0de2..704088a3d0d1 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c @@ -1475,7 +1475,7 @@ ng_btsocket_rfcomm_session_accept(ng_btsocket_rfcomm_session_p s0) s->state = NG_BTSOCKET_RFCOMM_SESSION_CONNECTED; /* - * Adjust MTU on incomming connection. Reserve 5 bytes: + * Adjust MTU on incoming connection. Reserve 5 bytes: * RFCOMM frame header, one extra byte for length and * one extra byte for credits. */ @@ -2881,7 +2881,7 @@ ng_btsocket_rfcomm_receive_pn(ng_btsocket_rfcomm_session_p s, struct mbuf *m0) mtx_unlock(&pcb->pcb_mtx); } else if (RFCOMM_CR(hdr->type)) { - /* PN request to non-existing dlci - incomming connection */ + /* PN request to non-existing dlci - incoming connection */ pcb = ng_btsocket_rfcomm_connect_ind(s, RFCOMM_SRVCHANNEL(pn->dlci)); if (pcb != NULL) { diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c b/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c index 9ff0cebabb88..13985998ab9d 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c @@ -1261,10 +1261,10 @@ ng_btsocket_sco_attach(struct socket *so, int proto, struct thread *td) * This is totally FUBAR. We could get here in two cases: * * 1) When user calls socket() - * 2) When we need to accept new incomming connection and call + * 2) When we need to accept new incoming connection and call * sonewconn() * - * In the first case we must aquire ng_btsocket_sco_sockets_mtx. + * In the first case we must acquire ng_btsocket_sco_sockets_mtx. * In the second case we hold ng_btsocket_sco_sockets_mtx already. * So we now need to distinguish between these cases. From reading * /sys/kern/uipc_socket2.c we can find out that sonewconn() calls diff --git a/sys/netgraph/netflow/ng_netflow.c b/sys/netgraph/netflow/ng_netflow.c index a14290357e43..9ada1339deb9 100644 --- a/sys/netgraph/netflow/ng_netflow.c +++ b/sys/netgraph/netflow/ng_netflow.c @@ -826,7 +826,7 @@ ng_netflow_rcvdata (hook_p hook, item_p item) goto bypass; /* - * Loop thru IPv6 extended headers to get upper + * Loop through IPv6 extended headers to get upper * layer header / frag. */ for (;;) { diff --git a/sys/netgraph/netflow/ng_netflow.h b/sys/netgraph/netflow/ng_netflow.h index d7f06afceabc..24dde4a18864 100644 --- a/sys/netgraph/netflow/ng_netflow.h +++ b/sys/netgraph/netflow/ng_netflow.h @@ -166,7 +166,7 @@ struct ng_netflow_setmtu { uint16_t mtu; /* MTU for packet */ }; -/* This structure is used in NGM_NETFLOW_SHOW request/responce */ +/* This structure is used in NGM_NETFLOW_SHOW request/response */ struct ngnf_show_header { u_char version; /* IPv4 or IPv6 */ uint32_t hash_id; /* current hash index */ diff --git a/sys/netgraph/netgraph.h b/sys/netgraph/netgraph.h index 9fc8986b2cdb..c7b0e67902cf 100644 --- a/sys/netgraph/netgraph.h +++ b/sys/netgraph/netgraph.h @@ -109,7 +109,7 @@ typedef int ng_rcvitem (node_p node, hook_p hook, item_p item); */ struct ng_hook { char hk_name[NG_HOOKSIZ]; /* what this node knows this link as */ - void *hk_private; /* node dependant ID for this hook */ + void *hk_private; /* node dependent ID for this hook */ int hk_flags; /* info about this hook/link */ int hk_type; /* tbd: hook data link type */ struct ng_hook *hk_peer; /* the other end of this link */ @@ -362,7 +362,7 @@ struct ng_node { struct ng_type *nd_type; /* the installed 'type' */ int nd_flags; /* see below for bit definitions */ int nd_numhooks; /* number of hooks */ - void *nd_private; /* node type dependant node ID */ + void *nd_private; /* node type dependent node ID */ ng_ID_t nd_ID; /* Unique per node */ LIST_HEAD(hooks, ng_hook) nd_hooks; /* linked list of node hooks */ LIST_ENTRY(ng_node) nd_nodes; /* name hash collision list */ @@ -1066,7 +1066,7 @@ struct ng_cmdlist { * Note the input queueing system is to allow modules * to 'release the stack' or to pass data across spl layers. * The data will be redelivered as soon as the NETISR code runs - * which may be almost immediatly. A node may also do it's own queueing + * which may be almost immediately. A node may also do it's own queueing * for other reasons (e.g. device output queuing). */ struct ng_type { diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c index af8505cb78b3..25a9cb8e3ed3 100644 --- a/sys/netgraph/ng_base.c +++ b/sys/netgraph/ng_base.c @@ -759,7 +759,7 @@ ng_rmnode(node_p node, hook_p dummy1, void *dummy2, int dummy3) /* * Well, blow me down if the node code hasn't declared * that it doesn't want to die. - * Presumably it is a persistant node. + * Presumably it is a persistent node. * If we REALLY want it to go away, * e.g. hardware going away, * Our caller should set NGF_REALLY_DIE in nd_flags. @@ -2935,7 +2935,7 @@ ng_generic_msg(node_p here, item_p item, hook_p lasthook) * Sometimes a generic message may be statically allocated * to avoid problems with allocating when in tight memory situations. * Don't free it if it is so. - * I break them appart here, because erros may cause a free if the item + * I break them apart here, because erros may cause a free if the item * in which case we'd be doing it twice. * they are kept together above, to simplify freeing. */ diff --git a/sys/netgraph/ng_bridge.c b/sys/netgraph/ng_bridge.c index a902f00a477d..a1e3f2658d38 100644 --- a/sys/netgraph/ng_bridge.c +++ b/sys/netgraph/ng_bridge.c @@ -327,7 +327,7 @@ ng_bridge_constructor(node_p node) /* * This node has all kinds of stuff that could be screwed by SMP. * Until it gets it's own internal protection, we go through in - * single file. This could hurt a machine bridging beteen two + * single file. This could hurt a machine bridging between two * GB ethernets so it should be fixed. * When it's fixed the process SHOULD NOT SLEEP, spinlocks please! * (and atomic ops ) diff --git a/sys/netgraph/ng_car.c b/sys/netgraph/ng_car.c index 84e880874e92..cdbaf5a3c920 100644 --- a/sys/netgraph/ng_car.c +++ b/sys/netgraph/ng_car.c @@ -28,7 +28,7 @@ */ /* - * ng_car - An implementation of commited access rate for netgraph + * ng_car - An implementation of committed access rate for netgraph * * TODO: * - Sanitize input config values (impose some limits) @@ -49,14 +49,14 @@ #include <netgraph/ng_car.h> #define NG_CAR_QUEUE_SIZE 100 /* Maximum queue size for SHAPE mode */ -#define NG_CAR_QUEUE_MIN_TH 8 /* Minimum RED threshhold for SHAPE mode */ +#define NG_CAR_QUEUE_MIN_TH 8 /* Minimum RED threshold for SHAPE mode */ /* Hook private info */ struct hookinfo { hook_p hook; /* this (source) hook */ hook_p dest; /* destination hook */ - int64_t tc; /* commited token bucket counter */ + int64_t tc; /* committed token bucket counter */ int64_t te; /* exceeded/peak token bucket counter */ struct bintime lastRefill; /* last token refill time */ @@ -296,7 +296,7 @@ ng_car_rcvdata(hook_p hook, item_p item ) len = m->m_pkthdr.len; } - /* Check commited token bucket. */ + /* Check committed token bucket. */ if (hinfo->tc - len >= 0) { /* This packet is green. */ ++hinfo->stats.green_pkts; @@ -307,7 +307,7 @@ ng_car_rcvdata(hook_p hook, item_p item ) /* Refill only if not green without it. */ ng_car_refillhook(hinfo); - /* Check commited token bucket again after refill. */ + /* Check committed token bucket again after refill. */ if (hinfo->tc - len >= 0) { /* This packet is green */ ++hinfo->stats.green_pkts; @@ -339,7 +339,7 @@ ng_car_rcvdata(hook_p hook, item_p item ) hinfo->tc -= len; NG_CAR_PERFORM_MATCH_ACTION(hinfo->conf.yellow_action); } else { - /* This packet is probaly red. */ + /* This packet is probably red. */ ++hinfo->stats.red_pkts; hinfo->te = 0; NG_CAR_PERFORM_MATCH_ACTION(hinfo->conf.red_action); @@ -608,7 +608,7 @@ ng_car_refillhook(struct hookinfo *h) if (h->conf.mode == NG_CAR_SINGLE_RATE) { int64_t delta; - /* Refill commited token bucket. */ + /* Refill committed token bucket. */ h->tc += (h->conf.cir * deltat_us) >> 23; delta = h->tc - h->conf.cbs; if (delta > 0) { @@ -621,7 +621,7 @@ ng_car_refillhook(struct hookinfo *h) } } else if (h->conf.mode == NG_CAR_DOUBLE_RATE) { - /* Refill commited token bucket. */ + /* Refill committed token bucket. */ h->tc += (h->conf.cir * deltat_us) >> 23; if (h->tc > ((int64_t)h->conf.cbs)) h->tc = h->conf.cbs; @@ -632,7 +632,7 @@ ng_car_refillhook(struct hookinfo *h) h->te = h->conf.ebs; } else { /* RED or SHAPE mode. */ - /* Refill commited token bucket. */ + /* Refill committed token bucket. */ h->tc += (h->conf.cir * deltat_us) >> 23; if (h->tc > ((int64_t)h->conf.cbs)) h->tc = h->conf.cbs; diff --git a/sys/netgraph/ng_car.h b/sys/netgraph/ng_car.h index b4ebb7d45c8a..3fda67512dd0 100644 --- a/sys/netgraph/ng_car.h +++ b/sys/netgraph/ng_car.h @@ -69,9 +69,9 @@ struct ng_car_bulkstats { /* Per hook configuration */ struct ng_car_hookconf { - u_int64_t cbs; /* Commited burst size (bytes) */ + u_int64_t cbs; /* Committed burst size (bytes) */ u_int64_t ebs; /* Exceeded/Peak burst size (bytes) */ - u_int64_t cir; /* Commited information rate (bits/s) */ + u_int64_t cir; /* Committed information rate (bits/s) */ u_int64_t pir; /* Peak information rate (bits/s) */ u_int8_t green_action; /* Action for green packets */ u_int8_t yellow_action; /* Action for yellow packets */ diff --git a/sys/netgraph/ng_etf.c b/sys/netgraph/ng_etf.c index 2167b5d12635..66eab2760b60 100644 --- a/sys/netgraph/ng_etf.c +++ b/sys/netgraph/ng_etf.c @@ -228,7 +228,7 @@ ng_etf_newhook(node_p node, hook_p hook, const char *name) /* * Get a netgraph control message. - * We actually recieve a queue item that has a pointer to the message. + * We actually receive a queue item that has a pointer to the message. * If we free the item, the message will be freed too, unless we remove * it from the item using NGI_GET_MSG(); * The return address is also stored in the item, as an ng_ID_t, diff --git a/sys/netgraph/ng_ether.c b/sys/netgraph/ng_ether.c index 430b8591bc0a..42c4f0ea01e2 100644 --- a/sys/netgraph/ng_ether.c +++ b/sys/netgraph/ng_ether.c @@ -754,7 +754,7 @@ ng_ether_shutdown(node_p node) if (node->nd_flags & NGF_REALLY_DIE) { /* * WE came here because the ethernet card is being unloaded, - * so stop being persistant. + * so stop being persistent. * Actually undo all the things we did on creation. * Assume the ifp has already been freed. */ diff --git a/sys/netgraph/ng_frame_relay.c b/sys/netgraph/ng_frame_relay.c index a4a84fe37c3f..b931e897be88 100644 --- a/sys/netgraph/ng_frame_relay.c +++ b/sys/netgraph/ng_frame_relay.c @@ -364,7 +364,7 @@ ngfrm_rcvdata(hook_p hook, item_p item) data = mtod(m, char *); /* - * Shift the lowest bits into the address field untill we are done. + * Shift the lowest bits into the address field until we are done. * First byte is MSBits of addr so work backwards. */ switch (alen) { diff --git a/sys/netgraph/ng_gif.c b/sys/netgraph/ng_gif.c index 580b8b13bd85..199546c60bad 100644 --- a/sys/netgraph/ng_gif.c +++ b/sys/netgraph/ng_gif.c @@ -491,7 +491,7 @@ ng_gif_shutdown(node_p node) if (node->nd_flags & NGF_REALLY_DIE) { /* * WE came here because the gif interface is being destroyed, - * so stop being persistant. + * so stop being persistent. * Actually undo all the things we did on creation. * Assume the ifp has already been freed. */ diff --git a/sys/netgraph/ng_gif_demux.c b/sys/netgraph/ng_gif_demux.c index 0a0644eb18d1..67de5a12f47e 100644 --- a/sys/netgraph/ng_gif_demux.c +++ b/sys/netgraph/ng_gif_demux.c @@ -70,7 +70,7 @@ * * Packets received on the "gif" hook have their type header removed * and are passed to the appropriate hook protocol hook. Packets - * recieved on a protocol hook have a type header added back and are + * received on a protocol hook have a type header added back and are * passed out the gif hook. The currently supported protocol hooks are: */ diff --git a/sys/netgraph/ng_ksocket.c b/sys/netgraph/ng_ksocket.c index 07978424f4f0..af37f4d21b45 100644 --- a/sys/netgraph/ng_ksocket.c +++ b/sys/netgraph/ng_ksocket.c @@ -632,7 +632,7 @@ ng_ksocket_connect(hook_p hook) * first created and now (on another processesor) will * be earlier on the queue than the request to finalise the hook. * By the time the hook is finalised, - * The queued upcalls will have happenned and the code + * The queued upcalls will have happened and the code * will have discarded them because of a lack of a hook. * (socket not open). * @@ -642,9 +642,9 @@ ng_ksocket_connect(hook_p hook) * Since we are a netgraph operation * We know that we hold a lock on this node. This forces the * request we make below to be queued rather than implemented - * immediatly which will cause the upcall function to be called a bit + * immediately which will cause the upcall function to be called a bit * later. - * However, as we will run any waiting queued operations immediatly + * However, as we will run any waiting queued operations immediately * after doing this one, if we have not finalised the other end * of the hook, those queued operations will fail. */ diff --git a/sys/netgraph/ng_l2tp.h b/sys/netgraph/ng_l2tp.h index 106162b0c865..45b66b07d4ab 100644 --- a/sys/netgraph/ng_l2tp.h +++ b/sys/netgraph/ng_l2tp.h @@ -54,7 +54,7 @@ #define NG_L2TP_HOOK_SESSION_P "session_" /* session data hook (prefix) */ #define NG_L2TP_HOOK_SESSION_F "session_%04x" /* session data hook (format) */ -/* Set intial sequence numbers to not yet enabled node. */ +/* Set initial sequence numbers to not yet enabled node. */ struct ng_l2tp_seq_config { u_int16_t ns; /* sequence number to send next */ u_int16_t nr; /* sequence number to be recved next */ diff --git a/sys/netgraph/ng_lmi.c b/sys/netgraph/ng_lmi.c index 6d3fb208b19f..a51c024617e1 100644 --- a/sys/netgraph/ng_lmi.c +++ b/sys/netgraph/ng_lmi.c @@ -429,7 +429,7 @@ ngauto_state_machine(sc_p sc) break; } - /* send an inquirey encoded appropriatly */ + /* send an inquirey encoded appropriately */ nglmi_inquire(sc, 0); sc->poll_count--; } @@ -585,7 +585,7 @@ nglmi_rcvdata(hook_p hook, item_p item) /* Now check if there is a 'locking shift'. This is only seen in * Annex D frames. don't bother checking, we already did that. Don't - * increment immediatly as it might not be there. */ + * increment immediately as it might not be there. */ if (ANNEXD(sc)) STEPBY(1); diff --git a/sys/netgraph/ng_one2many.c b/sys/netgraph/ng_one2many.c index ad1d3d882586..501575155e99 100644 --- a/sys/netgraph/ng_one2many.c +++ b/sys/netgraph/ng_one2many.c @@ -44,7 +44,7 @@ * ng_one2many(4) netgraph node type * * Packets received on the "one" hook are sent out each of the - * "many" hooks accoring to an algorithm. Packets received on any + * "many" hooks according to an algorithm. Packets received on any * "many" hook are always delivered to the "one" hook. */ diff --git a/sys/netgraph/ng_ppp.c b/sys/netgraph/ng_ppp.c index e1a8a2a31985..3e27237642a1 100644 --- a/sys/netgraph/ng_ppp.c +++ b/sys/netgraph/ng_ppp.c @@ -152,7 +152,7 @@ static MALLOC_DEFINE(M_NETGRAPH_PPP, "netgraph_ppp", "netgraph ppp node"); ((s) | ~MP_LONG_SEQ_MASK) \ : ((s) & MP_LONG_SEQ_MASK)) -/* Comparision of MP sequence numbers. Note: all sequence numbers +/* Comparison of MP sequence numbers. Note: all sequence numbers except priv->xseq are stored with the sign bit extended. */ #define MP_SHORT_SEQ_DIFF(x,y) MP_SHORT_EXTEND((x) - (y)) #define MP_LONG_SEQ_DIFF(x,y) MP_LONG_EXTEND((x) - (y)) @@ -211,7 +211,7 @@ struct ng_ppp_private { struct ng_ppp_link links[NG_PPP_MAX_LINKS];/* per-link info */ int32_t xseq; /* next out MP seq # */ int32_t mseq; /* min links[i].seq */ - uint16_t activeLinks[NG_PPP_MAX_LINKS]; /* indicies */ + uint16_t activeLinks[NG_PPP_MAX_LINKS]; /* indices */ uint16_t numActiveLinks; /* how many links up */ uint16_t lastLink; /* for round robin */ uint8_t vjCompHooked; /* VJ comp hooked up? */ @@ -254,7 +254,7 @@ static ng_rcvdata_t ng_ppp_rcvdata_decompress; static ng_rcvdata_t ng_ppp_rcvdata_encrypt; static ng_rcvdata_t ng_ppp_rcvdata_decrypt; -/* We use integer indicies to refer to the non-link hooks. */ +/* We use integer indices to refer to the non-link hooks. */ static const struct { char *const name; ng_rcvdata_t *fn; @@ -1511,7 +1511,7 @@ done: * discarded, their missing fragments are declared lost and MSEQ * is increased. * - * o If we recieve a fragment with seq# < MSEQ, we throw it away + * o If we receive a fragment with seq# < MSEQ, we throw it away * because we've already delcared it lost. * * This assumes linkNum != NG_PPP_BUNDLE_LINKNUM. diff --git a/sys/netgraph/ng_pppoe.c b/sys/netgraph/ng_pppoe.c index 382410c25465..9a23b1ba6bab 100644 --- a/sys/netgraph/ng_pppoe.c +++ b/sys/netgraph/ng_pppoe.c @@ -788,7 +788,7 @@ ng_pppoe_rcvmsg(node_p node, item_p item, hook_p lasthook) } /* - * PPPOE_SERVICE advertisments are set up + * PPPOE_SERVICE advertisements are set up * on sessions that are in PRIMED state. */ if (msg->header.cmd == NGM_PPPOE_SERVICE) @@ -1729,7 +1729,7 @@ ng_pppoe_rcvdata_debug(hook_p hook, item_p item) /* * Do local shutdown processing.. - * If we are a persistant device, we might refuse to go away, and + * If we are a persistent device, we might refuse to go away, and * we'd only remove our links and reset ourself. */ static int diff --git a/sys/netgraph/ng_pptpgre.c b/sys/netgraph/ng_pptpgre.c index 6dc5b2d0ea6d..0941d8eb7d18 100644 --- a/sys/netgraph/ng_pptpgre.c +++ b/sys/netgraph/ng_pptpgre.c @@ -124,7 +124,7 @@ typedef u_int64_t pptptime_t; #define PPTP_MIN_TIMEOUT (PPTP_TIME_SCALE / 83) /* 12 milliseconds */ #define PPTP_MAX_TIMEOUT (3 * PPTP_TIME_SCALE) /* 3 seconds */ -/* When we recieve a packet, we wait to see if there's an outgoing packet +/* When we receive a packet, we wait to see if there's an outgoing packet we can piggy-back the ACK off of. These parameters determine the mimimum and maxmimum length of time we're willing to wait in order to do that. These have no effect unless "enableDelayedAck" is turned on. */ diff --git a/sys/netgraph/ng_sample.c b/sys/netgraph/ng_sample.c index f0e4d5040e8b..8fa66229fb4d 100644 --- a/sys/netgraph/ng_sample.c +++ b/sys/netgraph/ng_sample.c @@ -241,7 +241,7 @@ ng_xxx_newhook(node_p node, hook_p hook, const char *name) /* * Get a netgraph control message. - * We actually recieve a queue item that has a pointer to the message. + * We actually receive a queue item that has a pointer to the message. * If we free the item, the message will be freed too, unless we remove * it from the item using NGI_GET_MSG(); * The return address is also stored in the item, as an ng_ID_t, @@ -404,8 +404,8 @@ devintr() /* * Do local shutdown processing.. * All our links and the name have already been removed. - * If we are a persistant device, we might refuse to go away. - * In the case of a persistant node we signal the framework that we + * If we are a persistent device, we might refuse to go away. + * In the case of a persistent node we signal the framework that we * are still in business by clearing the NGF_INVALID bit. However * If we find the NGF_REALLY_DIE bit set, this means that * we REALLY need to die (e.g. hardware removed). @@ -426,7 +426,7 @@ ng_xxx_shutdown(node_p node) if (node->nd_flags & NGF_REALLY_DIE) { /* * WE came here because the widget card is being unloaded, - * so stop being persistant. + * so stop being persistent. * Actually undo all the things we did on creation. */ NG_NODE_SET_PRIVATE(node, NULL); diff --git a/sys/netgraph/ng_source.c b/sys/netgraph/ng_source.c index 8332d20f9f28..ea341b6ce7c1 100644 --- a/sys/netgraph/ng_source.c +++ b/sys/netgraph/ng_source.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); /* * This node is used for high speed packet geneneration. It queues - * all data recieved on its 'input' hook and when told to start via + * all data received on its 'input' hook and when told to start via * a control message it sends the packets out its 'output' hook. In * this way this node can be preloaded with a packet stream which it * can then send continuously as fast as possible. diff --git a/sys/netgraph/ng_split.h b/sys/netgraph/ng_split.h index c8b672c605ad..d3082aebaae7 100644 --- a/sys/netgraph/ng_split.h +++ b/sys/netgraph/ng_split.h @@ -40,6 +40,6 @@ /* My hook names */ #define NG_SPLIT_HOOK_MIXED "mixed" /* Mixed stream (in/out) */ #define NG_SPLIT_HOOK_OUT "out" /* Output to outhook (sending out) */ -#define NG_SPLIT_HOOK_IN "in" /* Input from inhook (recieving) */ +#define NG_SPLIT_HOOK_IN "in" /* Input from inhook (receiving) */ #endif /* _NETGRAPH_NG_SPLIT_H_ */ diff --git a/sys/netgraph/ng_tee.c b/sys/netgraph/ng_tee.c index c6a517e0498e..b5ea0ea3cf41 100644 --- a/sys/netgraph/ng_tee.c +++ b/sys/netgraph/ng_tee.c @@ -168,7 +168,7 @@ ng_tee_newhook(node_p node, hook_p hook, const char *name) sc_p privdata = NG_NODE_PRIVATE(node); hi_p hinfo; - /* Precalculate internal pathes. */ + /* Precalculate internal paths. */ if (strcmp(name, NG_TEE_HOOK_RIGHT) == 0) { hinfo = &privdata->right; if (privdata->left.dest) @@ -371,7 +371,7 @@ ng_tee_disconnect(hook_p hook) KASSERT(hinfo != NULL, ("%s: null info", __func__)); hinfo->hook = NULL; - /* Recalculate internal pathes. */ + /* Recalculate internal paths. */ if (sc->left.dest == hinfo) { sc->left.dest = sc->left.dup; sc->left.dup = NULL; diff --git a/sys/netgraph/ng_tty.c b/sys/netgraph/ng_tty.c index 5e794a8a577f..ec0792e8c860 100644 --- a/sys/netgraph/ng_tty.c +++ b/sys/netgraph/ng_tty.c @@ -190,7 +190,7 @@ ngt_newhook(node_p node, hook_p hook, const char *name) /* * Set the hook into queueing mode (for outgoing packets), - * so that we wont deliver mbuf thru the whole graph holding + * so that we wont deliver mbuf through the whole graph holding * tty locks. */ static int diff --git a/sys/netgraph/ng_vjc.c b/sys/netgraph/ng_vjc.c index e689a1060890..1d8d3a942b8b 100644 --- a/sys/netgraph/ng_vjc.c +++ b/sys/netgraph/ng_vjc.c @@ -348,7 +348,7 @@ ng_vjc_rcvmsg(node_p node, item_p item, hook_p lasthook) sl = (struct slcompress *)resp->data; *sl = *sl0; - /* Replace pointers with integer indicies */ + /* Replace pointers with integer indices */ if (sl->last_cs != NULL) { index = sl0->last_cs - sl0->tstate; bzero(&sl->last_cs, sizeof(sl->last_cs)); diff --git a/sys/netgraph/ng_vlan.c b/sys/netgraph/ng_vlan.c index 1c10a0e1eb07..e2f8cb815681 100644 --- a/sys/netgraph/ng_vlan.c +++ b/sys/netgraph/ng_vlan.c @@ -387,7 +387,7 @@ ng_vlan_rcvmsg(node_p node, item_p item, hook_p lasthook) vlan_count ++; } - /* Allocate memory for responce. */ + /* Allocate memory for response. */ NG_MKRESPONSE(resp, msg, sizeof(*t) + vlan_count * sizeof(*t->filter), M_NOWAIT); if (resp == NULL) { @@ -395,7 +395,7 @@ ng_vlan_rcvmsg(node_p node, item_p item, hook_p lasthook) break; } - /* Pack data to responce. */ + /* Pack data to response. */ t = (struct ng_vlan_table *)resp->data; t->n = 0; vf = &t->filter[0]; @@ -565,7 +565,7 @@ ng_vlan_rcvdata(hook_p hook, item_p item) if (priv->vlan_hook[vid] != NULL) { /* - * VLAN filter: allways remove vlan tags and + * VLAN filter: always remove vlan tags and * decapsulate packet. */ dst_hook = priv->vlan_hook[vid]; |