From 04b4ef9c75ed734905ee1bdf681657395bf1dd08 Mon Sep 17 00:00:00 2001 From: Martynas Venckus Date: Mon, 26 Nov 2007 09:28:35 +0000 Subject: typos; ok jmc@ sys/netinet/in_pcb.c and sys/net/bridgestp.c ok henning@ sys/dev/pci/bktr/* ok jakemsr@ --- sys/net/bridgestp.c | 20 ++++++++++---------- sys/net/if_slvar.h | 4 ++-- sys/net/if_spppsubr.c | 6 +++--- sys/net/if_stripvar.h | 4 ++-- sys/net/if_trunk.c | 4 ++-- sys/net/zlib.c | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) (limited to 'sys/net') diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c index 0e0401dc253..85a92695454 100644 --- a/sys/net/bridgestp.c +++ b/sys/net/bridgestp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bridgestp.c,v 1.29 2007/10/30 09:04:47 henning Exp $ */ +/* $OpenBSD: bridgestp.c,v 1.30 2007/11/26 09:28:33 martynas Exp $ */ /* * Copyright (c) 2000 Jason L. Wright (jason@thought.net) @@ -154,7 +154,7 @@ __FBSDID("$FreeBSD: /repoman/r/ncvs/src/sys/net/bridgestp.c,v 1.25 2006/11/03 03 #define BSTP_MSGTYPE_RSTP 0x02 /* Rapid STP */ #define BSTP_MSGTYPE_TCN 0x80 /* Topology chg notification */ -#define BSTP_INFO_RECIEVED 1 +#define BSTP_INFO_RECEIVED 1 #define BSTP_INFO_MINE 2 #define BSTP_INFO_AGED 3 #define BSTP_INFO_DISABLED 4 @@ -736,7 +736,7 @@ bstp_received_bpdu(struct bstp_state *bs, struct bstp_port *bp, bp->bp_rcvdtca = 1; if (bp->bp_agree && - !bstp_pdu_bettersame(bp, BSTP_INFO_RECIEVED)) + !bstp_pdu_bettersame(bp, BSTP_INFO_RECEIVED)) bp->bp_agree = 0; /* copy the received priority and timers to the port */ @@ -751,7 +751,7 @@ bstp_received_bpdu(struct bstp_state *bs, struct bstp_port *bp, /* set expiry for the new info */ bstp_set_timer_msgage(bp); - bp->bp_infois = BSTP_INFO_RECIEVED; + bp->bp_infois = BSTP_INFO_RECEIVED; bstp_assign_roles(bs); break; @@ -847,8 +847,8 @@ bstp_pdu_rcvtype(struct bstp_port *bp, struct bstp_config_unit *cu) int bstp_pdu_bettersame(struct bstp_port *bp, int newinfo) { - if (newinfo == BSTP_INFO_RECIEVED && - bp->bp_infois == BSTP_INFO_RECIEVED && + if (newinfo == BSTP_INFO_RECEIVED && + bp->bp_infois == BSTP_INFO_RECEIVED && bstp_info_cmp(&bp->bp_port_pv, &bp->bp_msg_cu.cu_pv) >= INFO_SAME) return (1); @@ -918,9 +918,9 @@ bstp_assign_roles(struct bstp_state *bs) bs->bs_root_htime = bs->bs_bridge_htime; bs->bs_root_port = NULL; - /* check if any recieved info supersedes us */ + /* check if any received info supersedes us */ LIST_FOREACH(bp, &bs->bs_bplist, bp_next) { - if (bp->bp_infois != BSTP_INFO_RECIEVED) + if (bp->bp_infois != BSTP_INFO_RECEIVED) continue; pv = bp->bp_port_pv; @@ -983,7 +983,7 @@ bstp_assign_roles(struct bstp_state *bs) bstp_update_info(bp); break; - case BSTP_INFO_RECIEVED: + case BSTP_INFO_RECEIVED: if (bp == rbp) { /* * root priority is derived from this @@ -1815,7 +1815,7 @@ bstp_hello_timer_expiry(struct bstp_state *bs, struct bstp_port *bp) void bstp_message_age_expiry(struct bstp_state *bs, struct bstp_port *bp) { - if (bp->bp_infois == BSTP_INFO_RECIEVED) { + if (bp->bp_infois == BSTP_INFO_RECEIVED) { bp->bp_infois = BSTP_INFO_AGED; bstp_assign_roles(bs); DPRINTF("aged info on %s\n", bp->bp_ifp->if_xname); diff --git a/sys/net/if_slvar.h b/sys/net/if_slvar.h index 97d946bdc44..62eaf525427 100644 --- a/sys/net/if_slvar.h +++ b/sys/net/if_slvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_slvar.h,v 1.12 2003/12/07 15:41:27 markus Exp $ */ +/* $OpenBSD: if_slvar.h,v 1.13 2007/11/26 09:28:33 martynas Exp $ */ /* $NetBSD: if_slvar.h,v 1.16 1996/05/07 02:40:46 thorpej Exp $ */ /*- @@ -105,7 +105,7 @@ struct ifslstatsreq { /* visible flags */ #define SC_COMPRESS IFF_LINK0 /* compress TCP traffic */ -#define SC_NOICMP IFF_LINK1 /* supress ICMP traffic */ +#define SC_NOICMP IFF_LINK1 /* suppress ICMP traffic */ #define SC_AUTOCOMP IFF_LINK2 /* auto-enable TCP compression */ /* diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index a13bd70227f..167871eccf7 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_spppsubr.c,v 1.63 2007/11/21 19:52:04 canacar Exp $ */ +/* $OpenBSD: if_spppsubr.c,v 1.64 2007/11/26 09:28:33 martynas Exp $ */ /* * Synchronous PPP/Cisco link level subroutines. * Keepalive protocol implemented in both Cisco and PPP modes. @@ -4016,7 +4016,7 @@ sppp_chap_tlu(struct sppp *sp) if ((sp->hisauth.flags & AUTHFLAG_NORECHALLENGE) == 0) addlog("next re-challenge in %d seconds\n", i); else - addlog("re-challenging supressed\n"); + addlog("re-challenging suppressed\n"); } x = splnet(); @@ -4545,7 +4545,7 @@ sppp_keepalive(void *dummy) /* And now prepare LCP to reestablish the link, if configured to do so. */ sppp_cp_change_state(&lcp, sp, STATE_STOPPED); - /* Close connection imediatly, completition of this + /* Close connection immediately, completition of this * will summon the magic needed to reestablish it. */ sp->pp_tlf(sp); continue; diff --git a/sys/net/if_stripvar.h b/sys/net/if_stripvar.h index a83c83d2c7b..ee4566fed1c 100644 --- a/sys/net/if_stripvar.h +++ b/sys/net/if_stripvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_stripvar.h,v 1.8 2002/03/14 01:27:09 millert Exp $ */ +/* $OpenBSD: if_stripvar.h,v 1.9 2007/11/26 09:28:33 martynas Exp $ */ /* $NetBSD: if_stripvar.h,v 1.2.4.1 1996/08/05 20:37:51 jtc Exp $ */ #ifndef _NET_IF_STRIPVAR_H_ @@ -51,7 +51,7 @@ struct st_softc { /* visible flags */ #define SC_COMPRESS IFF_LINK0 /* compress TCP traffic */ -#define SC_NOICMP IFF_LINK1 /* supress ICMP traffic */ +#define SC_NOICMP IFF_LINK1 /* suppress ICMP traffic */ #define SC_AUTOCOMP IFF_LINK2 /* auto-enable TCP compression */ #ifdef _KERNEL diff --git a/sys/net/if_trunk.c b/sys/net/if_trunk.c index 21658653fcf..0e765c98ca6 100644 --- a/sys/net/if_trunk.c +++ b/sys/net/if_trunk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_trunk.c,v 1.39 2007/11/20 20:42:11 canacar Exp $ */ +/* $OpenBSD: if_trunk.c,v 1.40 2007/11/26 09:28:33 martynas Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Reyk Floeter @@ -1308,7 +1308,7 @@ trunk_fail_input(struct trunk_softc *tr, struct trunk_port *tp, if (tr->tr_primary->tp_link_state == LINK_STATE_DOWN) { tmp_tp = trunk_link_active(tr, NULL); /* - * If tmp_tp is null, we've recieved a packet when all + * If tmp_tp is null, we've received a packet when all * our links are down. Weird, but process it anyways. */ if ((tmp_tp == NULL || tmp_tp == tp)) { diff --git a/sys/net/zlib.c b/sys/net/zlib.c index 0a4392fa923..6d2a95084a9 100644 --- a/sys/net/zlib.c +++ b/sys/net/zlib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zlib.c,v 1.12 2003/12/10 07:22:42 itojun Exp $ */ +/* $OpenBSD: zlib.c,v 1.13 2007/11/26 09:28:33 martynas Exp $ */ /* $NetBSD: zlib.c,v 1.2 1996/03/16 23:55:40 christos Exp $ */ /* @@ -321,7 +321,7 @@ typedef struct deflate_state { int nice_match; /* Stop searching when current match exceeds this */ /* used by trees.c: */ - /* Didn't use ct_data typedef below to supress compiler warning */ + /* Didn't use ct_data typedef below to suppress compiler warning */ struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */ struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */ struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */ -- cgit v1.2.3