diff options
Diffstat (limited to 'sys/net')
49 files changed, 286 insertions, 286 deletions
diff --git a/sys/net/art.c b/sys/net/art.c index 4673e0a3fff..027b043ca3e 100644 --- a/sys/net/art.c +++ b/sys/net/art.c @@ -1,4 +1,4 @@ -/* $OpenBSD: art.c,v 1.25 2017/01/23 01:02:11 claudio Exp $ */ +/* $OpenBSD: art.c,v 1.26 2017/01/24 10:08:30 krw Exp $ */ /* * Copyright (c) 2015 Martin Pieuchot @@ -184,7 +184,7 @@ int art_bindex(struct art_table *at, uint8_t *addr, int plen) { uint8_t boff, bend; - uint32_t k; + uint32_t k; if (plen < at->at_offset || plen > (at->at_offset + at->at_bits)) return (-1); diff --git a/sys/net/bfd.c b/sys/net/bfd.c index 9704892823b..a4af3793cb9 100644 --- a/sys/net/bfd.c +++ b/sys/net/bfd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bfd.c,v 1.57 2017/01/24 03:53:32 phessler Exp $ */ +/* $OpenBSD: bfd.c,v 1.58 2017/01/24 10:08:30 krw Exp $ */ /* * Copyright (c) 2016 Peter Hessler <phessler@openbsd.org> @@ -375,7 +375,7 @@ bfd_start_task(void *arg) bfd->bc_sosend = bfd_sender(bfd, BFD_UDP_PORT_CONTROL); if (bfd->bc_sosend) { task_set(&bfd->bc_bfd_send_task, bfd_send_task, bfd); - task_add(bfdtq, &bfd->bc_bfd_send_task); + task_add(bfdtq, &bfd->bc_bfd_send_task); } return; @@ -484,7 +484,7 @@ bfd_listener(struct bfd_config *bfd, unsigned int port) struct socket * bfd_sender(struct bfd_config *bfd, unsigned int port) { - struct socket *so; + struct socket *so; struct rtentry *rt = bfd->bc_rt; struct proc *p = curproc; struct mbuf *m = NULL, *mopt = NULL; @@ -638,7 +638,7 @@ void bfd_timeout_tx(void *v) { struct bfd_config *bfd = v; - task_add(bfdtq, &bfd->bc_bfd_send_task); + task_add(bfdtq, &bfd->bc_bfd_send_task); } /* diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 64b16d53a2c..9b4cb346579 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bpf.c,v 1.158 2017/01/09 19:15:01 mpi Exp $ */ +/* $OpenBSD: bpf.c,v 1.159 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: bpf.c,v 1.33 1997/02/21 23:59:35 thorpej Exp $ */ /* @@ -8,7 +8,7 @@ * * This code is derived from the Stanford/CMU enet packet filter, * (net/enet.c) distributed as part of 4.3BSD, and code contributed - * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence + * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence * Berkeley Laboratory. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h index 546d11572cb..4d32c4f23bf 100644 --- a/sys/net/bpfdesc.h +++ b/sys/net/bpfdesc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bpfdesc.h,v 1.34 2017/01/09 19:15:01 mpi Exp $ */ +/* $OpenBSD: bpfdesc.h,v 1.35 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: bpfdesc.h,v 1.11 1995/09/27 18:30:42 thorpej Exp $ */ /* @@ -70,7 +70,7 @@ struct bpf_d { u_long bd_rtout; /* Read timeout in 'ticks' */ u_long bd_rdStart; /* when the read started */ struct srp bd_rfilter; /* read filter code */ - struct srp bd_wfilter; /* write filter code */ + struct srp bd_wfilter; /* write filter code */ u_long bd_rcount; /* number of packets received */ u_long bd_dcount; /* number of packets dropped */ diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c index dffbe6cccd5..dec7b86836c 100644 --- a/sys/net/bridgestp.c +++ b/sys/net/bridgestp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bridgestp.c,v 1.63 2016/09/20 12:14:49 bluhm Exp $ */ +/* $OpenBSD: bridgestp.c,v 1.64 2017/01/24 10:08:30 krw Exp $ */ /* * Copyright (c) 2000 Jason L. Wright (jason@thought.net) @@ -2017,7 +2017,7 @@ bstp_getstate(struct bstp_state *bs, struct bstp_port *bp) /* * Translate RSTP roles and states to STP port states - * (IEEE Std 802.1D-2004 Table 17-1). + * (IEEE Std 802.1D-2004 Table 17-1). */ if (bp->bp_role == BSTP_ROLE_DISABLED) state = BSTP_IFSTATE_DISABLED; diff --git a/sys/net/ethertypes.h b/sys/net/ethertypes.h index 96013ea47e3..e0b49415860 100644 --- a/sys/net/ethertypes.h +++ b/sys/net/ethertypes.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ethertypes.h,v 1.10 2008/12/05 01:25:24 sthen Exp $ */ +/* $OpenBSD: ethertypes.h,v 1.11 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: ethertypes.h,v 1.13 2002/02/10 01:28:32 thorpej Exp $ */ /* @@ -63,23 +63,23 @@ /* 0x0400 Nixdorf */ #define ETHERTYPE_NS 0x0600 /* XNS */ #define ETHERTYPE_NSAT 0x0601 /* XNS Address Translation (3Mb only) */ -#define ETHERTYPE_DLOG1 0x0660 /* DLOG (?) */ -#define ETHERTYPE_DLOG2 0x0661 /* DLOG (?) */ +#define ETHERTYPE_DLOG1 0x0660 /* DLOG (?) */ +#define ETHERTYPE_DLOG2 0x0661 /* DLOG (?) */ #define ETHERTYPE_IP 0x0800 /* IP protocol */ #define ETHERTYPE_X75 0x0801 /* X.75 Internet */ #define ETHERTYPE_NBS 0x0802 /* NBS Internet */ #define ETHERTYPE_ECMA 0x0803 /* ECMA Internet */ -#define ETHERTYPE_CHAOS 0x0804 /* CHAOSnet */ +#define ETHERTYPE_CHAOS 0x0804 /* CHAOSnet */ #define ETHERTYPE_X25 0x0805 /* X.25 Level 3 */ #define ETHERTYPE_ARP 0x0806 /* Address resolution protocol */ #define ETHERTYPE_NSCOMPAT 0x0807 /* XNS Compatibility */ -#define ETHERTYPE_FRARP 0x0808 /* Frame Relay ARP (RFC1701) */ +#define ETHERTYPE_FRARP 0x0808 /* Frame Relay ARP (RFC1701) */ /* 0x081C Symbolics Private */ /* 0x0888 - 0x088A Xyplex */ #define ETHERTYPE_UBDEBUG 0x0900 /* Ungermann-Bass network debugger */ #define ETHERTYPE_IEEEPUP 0x0A00 /* Xerox IEEE802.3 PUP */ #define ETHERTYPE_IEEEPUPAT 0x0A01 /* Xerox IEEE802.3 PUP Address Translation */ -#define ETHERTYPE_VINES 0x0BAD /* Banyan VINES */ +#define ETHERTYPE_VINES 0x0BAD /* Banyan VINES */ #define ETHERTYPE_VINESLOOP 0x0BAE /* Banyan VINES Loopback */ #define ETHERTYPE_VINESECHO 0x0BAF /* Banyan VINES Echo */ @@ -93,7 +93,7 @@ #define ETHERTYPE_NTRAILER 16 #define ETHERTYPE_DCA 0x1234 /* DCA - Multicast */ -#define ETHERTYPE_VALID 0x1600 /* VALID system protocol */ +#define ETHERTYPE_VALID 0x1600 /* VALID system protocol */ #define ETHERTYPE_DOGFIGHT 0x1989 /* Artificial Horizons ("Aviator" dogfight simulator [on Sun]) */ #define ETHERTYPE_RCL 0x1995 /* Datapoint Corporation (RCL lan protocol) */ diff --git a/sys/net/if.c b/sys/net/if.c index 3e10955e1be..b94659bf6f6 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.479 2017/01/24 03:57:35 dlg Exp $ */ +/* $OpenBSD: if.c,v 1.480 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -1120,7 +1120,7 @@ if_isconnected(const struct ifnet *ifp0, unsigned int ifidx) #if NCARP > 0 if ((ifp0->if_type == IFT_CARP && ifp0->if_carpdev == ifp) || (ifp->if_type == IFT_CARP && ifp->if_carpdev == ifp0)) - connected = 1; + connected = 1; #endif if_put(ifp); diff --git a/sys/net/if.h b/sys/net/if.h index 549f854993a..89867eac340 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if.h,v 1.185 2017/01/24 03:57:35 dlg Exp $ */ +/* $OpenBSD: if.h,v 1.186 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: if.h,v 1.23 1996/05/07 02:40:27 thorpej Exp $ */ /* @@ -401,7 +401,7 @@ struct ifmediareq { uint64_t ifm_current; /* get/set current media options */ uint64_t ifm_mask; /* don't care mask */ uint64_t ifm_status; /* media status */ - uint64_t ifm_active; /* active options */ + uint64_t ifm_active; /* active options */ int ifm_count; /* # entries in ifm_ulist array */ uint64_t *ifm_ulist; /* media words */ }; diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h index b5cda8e41ff..e43c559e9e9 100644 --- a/sys/net/if_arp.h +++ b/sys/net/if_arp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_arp.h,v 1.6 2003/06/02 23:28:12 millert Exp $ */ +/* $OpenBSD: if_arp.h,v 1.7 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: if_arp.h,v 1.8 1995/03/08 02:56:52 cgd Exp $ */ /* @@ -46,9 +46,9 @@ */ struct arphdr { u_int16_t ar_hrd; /* format of hardware address */ -#define ARPHRD_ETHER 1 /* ethernet hardware format */ -#define ARPHRD_IEEE802 6 /* IEEE 802 hardware format */ -#define ARPHRD_FRELAY 15 /* frame relay hardware format */ +#define ARPHRD_ETHER 1 /* ethernet hardware format */ +#define ARPHRD_IEEE802 6 /* IEEE 802 hardware format */ +#define ARPHRD_FRELAY 15 /* frame relay hardware format */ #define ARPHRD_IEEE1394 24 /* IEEE 1394 (FireWire) hardware format */ u_int16_t ar_pro; /* format of protocol address */ u_int8_t ar_hln; /* length of hardware address */ @@ -58,7 +58,7 @@ struct arphdr { #define ARPOP_REPLY 2 /* response to previous request */ #define ARPOP_REVREQUEST 3 /* request protocol address given hardware */ #define ARPOP_REVREPLY 4 /* response giving protocol address */ -#define ARPOP_INVREQUEST 8 /* request to identify peer */ +#define ARPOP_INVREQUEST 8 /* request to identify peer */ #define ARPOP_INVREPLY 9 /* response identifying peer */ /* * The remaining fields are variable in size, diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index b1db190edec..43c8e5e478c 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.c,v 1.292 2017/01/23 11:37:29 mpi Exp $ */ +/* $OpenBSD: if_bridge.c,v 1.293 2017/01/24 10:08:30 krw Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -738,7 +738,7 @@ bridge_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *sa, struct bridge_tunneltag *brtag; int error; - /* ifp must be a member interface of the bridge. */ + /* ifp must be a member interface of the bridge. */ if (ifp->if_bridgeport == NULL) { m_freem(m); return (EINVAL); @@ -1092,12 +1092,12 @@ bridge_process(struct ifnet *ifp, struct mbuf *m) eh = mtod(m, struct ether_header *); if (ETHER_IS_MULTICAST(eh->ether_dhost)) { /* - * Reserved destination MAC addresses (01:80:C2:00:00:0x) + * Reserved destination MAC addresses (01:80:C2:00:00:0x) * should not be forwarded to bridge members according to * section 7.12.6 of the 802.1D-2004 specification. The * STP destination address (as stored in bstp_etheraddr) * is the first of these. - */ + */ if (bcmp(eh->ether_dhost, bstp_etheraddr, ETHER_ADDR_LEN - 1) == 0) { if (eh->ether_dhost[ETHER_ADDR_LEN - 1] == 0) { @@ -1116,11 +1116,11 @@ bridge_process(struct ifnet *ifp, struct mbuf *m) */ if ((ifl->bif_flags & IFBIF_STP) && (ifl->bif_state == BSTP_IFSTATE_DISCARDING)) - goto reenqueue; + goto reenqueue; mc = m_dup_pkt(m, ETHER_ALIGN, M_NOWAIT); if (mc == NULL) - goto reenqueue; + goto reenqueue; bridge_ifinput(ifp, mc); @@ -1133,7 +1133,7 @@ bridge_process(struct ifnet *ifp, struct mbuf *m) */ if ((ifl->bif_flags & IFBIF_STP) && (ifl->bif_state == BSTP_IFSTATE_DISCARDING)) - goto reenqueue; + goto reenqueue; /* * Unicast, make sure it's not for us. @@ -1976,7 +1976,7 @@ bridge_tunnel(struct mbuf *m) struct bridge_tunneltag * bridge_tunneltag(struct mbuf *m) { - struct m_tag *mtag; + struct m_tag *mtag; if ((mtag = m_tag_find(m, PACKET_TAG_TUNNEL, NULL)) == NULL) { mtag = m_tag_get(PACKET_TAG_TUNNEL, diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h index 966506f6391..d0c3d05f041 100644 --- a/sys/net/if_dl.h +++ b/sys/net/if_dl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_dl.h,v 1.10 2015/10/22 15:37:47 bluhm Exp $ */ +/* $OpenBSD: if_dl.h,v 1.11 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: if_dl.h,v 1.8 1995/03/26 20:30:13 jtc Exp $ */ /* @@ -32,19 +32,19 @@ * @(#)if_dl.h 8.1 (Berkeley) 6/10/93 */ -/* +/* * A Link-Level Sockaddr may specify the interface in one of two * ways: either by means of a system-provided index number (computed * anew and possibly differently on every reboot), or by a human-readable * string such as "il0" (for managerial convenience). - * + * * Census taking actions, such as something akin to SIOCGCONF would return * both the index and the human name. - * + * * High volume transactions (such as giving a link-level ``from'' address * in a recvfrom or recvmsg call) may be likely only to provide the indexed * form, (which requires fewer copy operations and less space). - * + * * The form and interpretation of the link-level address is purely a matter * of convention between the device driver and its consumers; however, it is * expected that all drivers for an interface of a given if_type will agree. diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 56376f2020c..f6dc1810e1d 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1,10 +1,10 @@ -/* $OpenBSD: if_ethersubr.c,v 1.241 2016/10/11 11:40:12 mikeb Exp $ */ +/* $OpenBSD: if_ethersubr.c,v 1.242 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -16,7 +16,7 @@ * 3. Neither the name of the project nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index 008464f7a8b..69671f70aa3 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gre.c,v 1.83 2017/01/23 11:37:29 mpi Exp $ */ +/* $OpenBSD: if_gre.c,v 1.84 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */ /* @@ -100,7 +100,7 @@ struct if_clone mobileip_cloner = * control acceptance of WCCPv1-style GRE packets through the * net.inet.gre.wccp value, but be aware it depends upon normal GRE being * allowed as well. - * + * */ int gre_allow = 0; int gre_wccp = 0; @@ -149,7 +149,7 @@ gre_clone_create(struct if_clone *ifc, int unit) sc->sc_ka_state = GRE_STATE_UKNWN; if (strcmp("gre", ifc->ifc_name) == 0) { - /* GRE encapsulation */ + /* GRE encapsulation */ sc->g_proto = IPPROTO_GRE; } else { /* Mobile IP encapsulation */ diff --git a/sys/net/if_gre.h b/sys/net/if_gre.h index 58b2fe51bb1..b5f1550d271 100644 --- a/sys/net/if_gre.h +++ b/sys/net/if_gre.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gre.h,v 1.13 2010/06/26 19:49:54 claudio Exp $ */ +/* $OpenBSD: if_gre.h,v 1.14 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: if_gre.h,v 1.5 1999/11/19 20:41:19 thorpej Exp $ */ /* @@ -16,7 +16,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR @@ -55,15 +55,15 @@ struct gre_softc { #define GRE_STATE_DOWN 1 #define GRE_STATE_HOLD 2 #define GRE_STATE_UP 3 -}; +}; struct gre_h { u_int16_t flags; /* GRE flags */ - u_int16_t ptype; /* protocol type of payload typically + u_int16_t ptype; /* protocol type of payload typically Ether protocol type*/ -/* - * from here on: fields are optional, presence indicated by flags +/* + * from here on: fields are optional, presence indicated by flags * u_int_16 checksum checksum (one-complements of GRE header and payload @@ -109,7 +109,7 @@ struct greip { struct gre_sre { u_int16_t sre_family; /* address family */ u_char sre_offset; /* offset to first octet of active entry */ - u_char sre_length; /* number of octets in the SRE. + u_char sre_length; /* number of octets in the SRE. sre_lengthl==0 -> last entry. */ u_char *sre_rtinfo; /* the routing information */ }; @@ -139,13 +139,13 @@ struct mobip_h { #define MOB_H_SBIT 0x0080 -/* - * ioctls needed to manipulate the interface +/* + * ioctls needed to manipulate the interface */ #ifdef _KERNEL extern LIST_HEAD(gre_softc_head, gre_softc) gre_softc_list; -extern int gre_allow; +extern int gre_allow; extern int gre_wccp; extern int ip_mobile_allow; diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index c14d7e2d840..90c5fd75c29 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -1,10 +1,10 @@ -/* $OpenBSD: if_loop.c,v 1.79 2017/01/23 11:37:29 mpi Exp $ */ +/* $OpenBSD: if_loop.c,v 1.80 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: if_loop.c,v 1.15 1996/05/07 02:40:33 thorpej Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -16,7 +16,7 @@ * 3. Neither the name of the project nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -63,11 +63,11 @@ /* * @(#)COPYRIGHT 1.1 (NRL) 17 January 1995 - * + * * NRL grants permission for redistribution and use in source and binary * forms, with or without modification, of the software and documentation * created at NRL provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright @@ -75,14 +75,14 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgements: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * This product includes software developed at the Information - * Technology Division, US Naval Research Laboratory. + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * This product includes software developed at the Information + * Technology Division, US Naval Research Laboratory. * 4. Neither the name of the NRL nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THE SOFTWARE PROVIDED BY NRL IS PROVIDED BY NRL AND CONTRIBUTORS ``AS * IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A @@ -94,7 +94,7 @@ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * The views and conclusions contained in the software and documentation * are those of the authors and should not be interpreted as representing * official policies, either expressed or implied, of the US Naval diff --git a/sys/net/if_media.c b/sys/net/if_media.c index 9d03a902428..5168b074cbd 100644 --- a/sys/net/if_media.c +++ b/sys/net/if_media.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_media.c,v 1.29 2015/10/17 20:41:41 stsp Exp $ */ +/* $OpenBSD: if_media.c,v 1.30 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: if_media.c,v 1.10 2000/03/13 23:52:39 soren Exp $ */ /*- @@ -94,7 +94,7 @@ * Compile-time options: * IFMEDIA_DEBUG: * turn on implementation-level debug printfs. - * Useful for debugging newly-ported drivers. + * Useful for debugging newly-ported drivers. */ #ifdef IFMEDIA_DEBUG @@ -163,7 +163,7 @@ ifmedia_list_add(struct ifmedia *ifm, struct ifmedia_entry *lp, int count) } /* - * Set the default active media. + * Set the default active media. * * Called by device-specific code which is assumed to have already * selected the default media in hardware. We do _not_ call the @@ -287,7 +287,7 @@ ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr, struct ifmedia *ifm, /* * Get list of available media and current media on interface. */ - case SIOCGIFMEDIA: + case SIOCGIFMEDIA: { struct ifmediareq *ifmr = (struct ifmediareq *) ifr; struct ifmedia_entry *ep; diff --git a/sys/net/if_media.h b/sys/net/if_media.h index 842daa82751..c520ce013cc 100644 --- a/sys/net/if_media.h +++ b/sys/net/if_media.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_media.h,v 1.38 2016/12/14 08:16:56 sthen Exp $ */ +/* $OpenBSD: if_media.h,v 1.39 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: if_media.h,v 1.22 2000/02/17 21:53:16 sommerfeld Exp $ */ /*- @@ -796,7 +796,7 @@ struct ifmedia_baudrate { { IFM_IEEE80211|IFM_IEEE80211_OFDM48, IF_Mbps(48) }, \ { IFM_IEEE80211|IFM_IEEE80211_OFDM54, IF_Mbps(54) }, \ { IFM_IEEE80211|IFM_IEEE80211_OFDM72, IF_Mbps(72) }, \ - /* These HT rates correspond to 20 MHz channel with no SGI. */ \ + /* These HT rates correspond to 20 MHz channel with no SGI. */ \ { IFM_IEEE80211|IFM_IEEE80211_HT_MCS0, IF_Kbps(6500) }, \ { IFM_IEEE80211|IFM_IEEE80211_HT_MCS1, IF_Mbps(13) }, \ { IFM_IEEE80211|IFM_IEEE80211_HT_MCS2, IF_Kbps(19500) }, \ diff --git a/sys/net/if_mpe.c b/sys/net/if_mpe.c index c7b38b3e6e4..cfd89dd9a26 100644 --- a/sys/net/if_mpe.c +++ b/sys/net/if_mpe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mpe.c,v 1.57 2017/01/23 11:37:29 mpi Exp $ */ +/* $OpenBSD: if_mpe.c,v 1.58 2017/01/24 10:08:30 krw Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -53,7 +53,7 @@ void mpeattach(int); int mpeoutput(struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *); + struct rtentry *); int mpeioctl(struct ifnet *, u_long, caddr_t); void mpestart(struct ifnet *); int mpe_clone_create(struct if_clone *, int); @@ -78,7 +78,7 @@ mpeattach(int nmpe) int mpe_clone_create(struct if_clone *ifc, int unit) { - struct ifnet *ifp; + struct ifnet *ifp; struct mpe_softc *mpeif; if ((mpeif = malloc(sizeof(*mpeif), @@ -138,7 +138,7 @@ struct sockaddr_storage mpedst; void mpestart(struct ifnet *ifp0) { - struct mbuf *m; + struct mbuf *m; struct sockaddr *sa = (struct sockaddr *)&mpedst; sa_family_t af; struct rtentry *rt; @@ -386,7 +386,7 @@ mpe_input(struct mbuf *m, struct ifnet *ifp, struct sockaddr_mpls *smpls, ip->ip_sum = 0; ip->ip_sum = in_cksum(m, hlen); } - + /* new receive if and move into correct rtable */ m->m_pkthdr.ph_ifidx = ifp->if_index; m->m_pkthdr.ph_rtableid = ifp->if_rdomain; diff --git a/sys/net/if_mpw.c b/sys/net/if_mpw.c index aaabf84498f..ad8ec988239 100644 --- a/sys/net/if_mpw.c +++ b/sys/net/if_mpw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mpw.c,v 1.18 2017/01/24 03:57:35 dlg Exp $ */ +/* $OpenBSD: if_mpw.c,v 1.19 2017/01/24 10:08:30 krw Exp $ */ /* * Copyright (c) 2015 Rafael Zalamena <rzalamena@openbsd.org> @@ -345,17 +345,17 @@ mpw_vlan_handle(struct mbuf *m, struct mpw_softc *sc) { struct ifnet *ifp; struct ifvlan *ifv; - + uint16_t type = ETHERTYPE_QINQ; uint16_t tag = 0; - + ifp = if_get(m->m_pkthdr.ph_ifidx); if (ifp != NULL && ifp->if_qstart == vlan_start && ISSET(ifp->if_flags, IFF_RUNNING)) { - ifv = ifp->if_softc; + ifv = ifp->if_softc; type = ifv->ifv_type; tag = ifv->ifv_tag; - } + } if_put(ifp); return (vlan_inject(m, type, tag)); @@ -413,12 +413,12 @@ mpw_start(struct ifnet *ifp) } #else /* Ethernet tagged doesn't work without VLANs'*/ - m_freem(m); - continue; + m_freem(m); + continue; #endif /* NVLAN */ } - - if (sc->sc_flags & IMR_FLAG_CONTROLWORD) { + + if (sc->sc_flags & IMR_FLAG_CONTROLWORD) { M_PREPEND(m, sizeof(*shim), M_NOWAIT); if (m == NULL) continue; diff --git a/sys/net/if_pflog.c b/sys/net/if_pflog.c index 1a38758bea1..d90b29af24a 100644 --- a/sys/net/if_pflog.c +++ b/sys/net/if_pflog.c @@ -1,10 +1,10 @@ -/* $OpenBSD: if_pflog.c,v 1.77 2017/01/23 11:37:29 mpi Exp $ */ +/* $OpenBSD: if_pflog.c,v 1.78 2017/01/24 10:08:30 krw Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), - * Angelos D. Keromytis (kermit@csd.uch.gr) and + * Angelos D. Keromytis (kermit@csd.uch.gr) and * Niels Provos (provos@physnet.uni-hamburg.de). * - * This code was written by John Ioannidis for BSD/OS in Athens, Greece, + * This code was written by John Ioannidis for BSD/OS in Athens, Greece, * in November 1995. * * Ported to OpenBSD and NetBSD, with additional transforms, in December 1996, @@ -21,7 +21,7 @@ * Permission to use, copy, and modify this software with or without fee * is hereby granted, provided that this entire notice is included in * all copies of any software which is or includes a copy or - * modification of this software. + * modification of this software. * You may use this code under the GNU public license if you so wish. Please * contribute changes back to the authors under this freer than GPL license * so that we may further the use of strong encryption without limitations to @@ -76,7 +76,7 @@ void pflogattach(int); int pflogifs_resize(size_t); int pflogoutput(struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *); + struct rtentry *); int pflogioctl(struct ifnet *, u_long, caddr_t); void pflogstart(struct ifnet *); int pflog_clone_create(struct if_clone *, int); diff --git a/sys/net/if_pflow.c b/sys/net/if_pflow.c index c599beb8e74..4be1dab0f9b 100644 --- a/sys/net/if_pflow.c +++ b/sys/net/if_pflow.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pflow.c,v 1.70 2017/01/23 11:37:29 mpi Exp $ */ +/* $OpenBSD: if_pflow.c,v 1.71 2017/01/24 10:08:30 krw Exp $ */ /* * Copyright (c) 2011 Florian Obser <florian@narrans.de> @@ -592,11 +592,11 @@ pflow_setmtu(struct pflow_softc *sc, int mtu_req) if (sc->sc_maxcount > PFLOW_MAXFLOWS) sc->sc_maxcount = PFLOW_MAXFLOWS; sc->sc_if.if_mtu = sizeof(struct pflow_header) + - sizeof(struct udpiphdr) + + sizeof(struct udpiphdr) + sc->sc_maxcount * sizeof(struct pflow_flow); break; case PFLOW_PROTO_10: - sc->sc_if.if_mtu = + sc->sc_if.if_mtu = pflow_calc_mtu(sc, mtu, sizeof(struct pflow_v10_header)); break; default: /* NOTREACHED */ diff --git a/sys/net/if_pflow.h b/sys/net/if_pflow.h index f4a2bd33f88..40126001022 100644 --- a/sys/net/if_pflow.h +++ b/sys/net/if_pflow.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pflow.h,v 1.14 2015/10/03 10:44:23 florian Exp $ */ +/* $OpenBSD: if_pflow.h,v 1.15 2017/01/24 10:08:30 krw Exp $ */ /* * Copyright (c) 2008 Henning Brauer <henning@openbsd.org> @@ -112,7 +112,7 @@ struct pflow_ipfix_tmpl_ipv4 { /* update pflow_clone_create() when changing pflow_ipfix_tmpl_v6 */ struct pflow_ipfix_tmpl_ipv6 { - struct pflow_tmpl_hdr h; + struct pflow_tmpl_hdr h; struct pflow_tmpl_fspec src_ip; struct pflow_tmpl_fspec dest_ip; struct pflow_tmpl_fspec if_index_in; diff --git a/sys/net/if_pppvar.h b/sys/net/if_pppvar.h index 03ac473dd4b..87f7d1798bb 100644 --- a/sys/net/if_pppvar.h +++ b/sys/net/if_pppvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pppvar.h,v 1.18 2015/11/06 09:04:36 dlg Exp $ */ +/* $OpenBSD: if_pppvar.h,v 1.19 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: if_pppvar.h,v 1.5 1997/01/03 07:23:29 mikel Exp $ */ /* * if_pppvar.h - private structures and declarations for PPP. @@ -124,7 +124,7 @@ struct ppp_softc { struct bpf_program sc_pass_filt; /* filter for packets to pass */ struct bpf_program sc_active_filt; /* filter for "non-idle" packets */ #ifdef VJC - struct slcompress *sc_comp; /* vjc control buffer */ + struct slcompress *sc_comp; /* vjc control buffer */ #endif /* Device-dependent part for async lines. */ @@ -146,7 +146,7 @@ struct ppp_softc { struct ppp_pkt_hdr { struct ppp_pkt *ph_next; /* next in pkt chain */ - struct ppp_pkt *ph_pkt; /* prev in chain or next in list */ + struct ppp_pkt *ph_pkt; /* prev in chain or next in list */ uint16_t ph_len; uint16_t ph_errmark; }; diff --git a/sys/net/if_pppx.c b/sys/net/if_pppx.c index fbadf0cd9ab..8153eb84e69 100644 --- a/sys/net/if_pppx.c +++ b/sys/net/if_pppx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pppx.c,v 1.56 2016/09/15 02:00:18 dlg Exp $ */ +/* $OpenBSD: if_pppx.c,v 1.57 2017/01/24 10:08:30 krw Exp $ */ /* * Copyright (c) 2010 Claudio Jeker <claudio@openbsd.org> @@ -903,7 +903,7 @@ pppx_add_session(struct pppx_dev *pxd, struct pipex_session_req *req) ia->ia_ifa.ifa_dstaddr = sintosa(&ia->ia_dstaddr); ia->ia_ifa.ifa_netmask = sintosa(&ia->ia_sockmask); ia->ia_ifa.ifa_ifp = ifp; - + ia->ia_netmask = ia->ia_sockmask.sin_addr.s_addr; error = in_ifinit(ifp, ia, &ifaddr, 1); diff --git a/sys/net/if_sppp.h b/sys/net/if_sppp.h index 2fb04a1e15e..5a7146f521b 100644 --- a/sys/net/if_sppp.h +++ b/sys/net/if_sppp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sppp.h,v 1.25 2016/06/14 20:44:43 sthen Exp $ */ +/* $OpenBSD: if_sppp.h,v 1.26 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: if_sppp.h,v 1.2.2.1 1999/04/04 06:57:39 explorer Exp $ */ /* @@ -23,10 +23,10 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * @@ -158,7 +158,7 @@ struct sppp { struct sppp *pp_next; /* next interface in keepalive list */ u_int pp_flags; u_int pp_framebytes; /* number of bytes added by hardware framing */ - u_short pp_alivecnt; /* keepalive packets counter */ + u_short pp_alivecnt; /* keepalive packets counter */ u_short pp_loopcnt; /* loopback detection counter */ u_int32_t pp_seq; /* local sequence number */ u_int32_t pp_rseq; /* remote sequence number */ diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index 86567ce4e89..c71eaf81fdd 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_spppsubr.c,v 1.161 2017/01/21 05:36:33 dlg Exp $ */ +/* $OpenBSD: if_spppsubr.c,v 1.162 2017/01/24 10:08:30 krw Exp $ */ /* * Synchronous PPP link level subroutines. * @@ -70,8 +70,8 @@ # define UNTIMEOUT(fun, arg, handle) \ timeout_del(&(handle)) -#define LOOPALIVECNT 3 /* loopback detection tries */ -#define MAXALIVECNT 3 /* max. missed alive packets */ +#define LOOPALIVECNT 3 /* loopback detection tries */ +#define MAXALIVECNT 3 /* max. missed alive packets */ #define NORECV_TIME 15 /* before we get worried */ /* @@ -1539,7 +1539,7 @@ sppp_to_event(const struct cp *cp, struct sppp *sp) case STATE_STOPPING: sppp_cp_send(sp, cp->proto, TERM_REQ, ++sp->pp_seq, 0, 0); - sppp_increasing_timeout (cp, sp); + sppp_increasing_timeout (cp, sp); break; case STATE_REQ_SENT: case STATE_ACK_RCVD: @@ -1548,7 +1548,7 @@ sppp_to_event(const struct cp *cp, struct sppp *sp) (cp->scr)(sp); break; case STATE_ACK_SENT: - sppp_increasing_timeout (cp, sp); + sppp_increasing_timeout (cp, sp); (cp->scr)(sp); break; } diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index d3876ab1b4a..0d2e7d839b8 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tun.c,v 1.172 2017/01/22 10:17:39 dlg Exp $ */ +/* $OpenBSD: if_tun.c,v 1.173 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $ */ /* @@ -649,7 +649,7 @@ tun_dev_ioctl(struct tun_softc *tp, u_long cmd, caddr_t data, int flag, } tp->tun_if.if_mtu = tunp->mtu; tp->tun_if.if_type = tunp->type; - tp->tun_if.if_flags = + tp->tun_if.if_flags = (tunp->flags & TUN_IFF_FLAGS) | (tp->tun_if.if_flags & ~TUN_IFF_FLAGS); tp->tun_if.if_baudrate = tunp->baudrate; @@ -729,7 +729,7 @@ tun_dev_ioctl(struct tun_softc *tp, u_long cmd, caddr_t data, int flag, break; default: #ifdef PIPEX - if (!(tp->tun_flags & TUN_LAYER2)) { + if (!(tp->tun_flags & TUN_LAYER2)) { int ret; ret = pipex_ioctl(&tp->pipex_iface, cmd, data); splx(s); diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index a0166e6b8c7..d53ee9f89dc 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vlan.c,v 1.170 2017/01/24 03:57:35 dlg Exp $ */ +/* $OpenBSD: if_vlan.c,v 1.171 2017/01/24 10:08:30 krw Exp $ */ /* * Copyright 1998 Massachusetts Institute of Technology @@ -14,7 +14,7 @@ * no representations about the suitability of this software for any * purpose. It is provided "as is" without express or implied * warranty. - * + * * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''. M.I.T. DISCLAIMS * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF @@ -74,7 +74,7 @@ #endif #define TAG_HASH_BITS 5 -#define TAG_HASH_SIZE (1 << TAG_HASH_BITS) +#define TAG_HASH_SIZE (1 << TAG_HASH_BITS) #define TAG_HASH_MASK (TAG_HASH_SIZE - 1) #define TAG_HASH(tag) (tag & TAG_HASH_MASK) SRPL_HEAD(, ifvlan) *vlan_tagh, *svlan_tagh; @@ -986,7 +986,7 @@ vlan_multi_add(struct ifvlan *ifv, struct ifreq *ifr) (*ifp0->if_ioctl)(ifp0, SIOCADDMULTI, (caddr_t)ifr); if_put(ifp0); - if (error != 0) + if (error != 0) goto ioctl_failed; return (error); diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h index 9361a9f33bd..a5f80bc40cf 100644 --- a/sys/net/if_vlan_var.h +++ b/sys/net/if_vlan_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vlan_var.h,v 1.36 2016/04/19 23:31:32 dlg Exp $ */ +/* $OpenBSD: if_vlan_var.h,v 1.37 2017/01/24 10:08:30 krw Exp $ */ /* * Copyright 1998 Massachusetts Institute of Technology @@ -14,7 +14,7 @@ * no representations about the suitability of this software for any * purpose. It is provided "as is" without express or implied * warranty. - * + * * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''. M.I.T. DISCLAIMS * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF diff --git a/sys/net/ifq.h b/sys/net/ifq.h index d159f80d0fe..3a6891da6f6 100644 --- a/sys/net/ifq.h +++ b/sys/net/ifq.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ifq.h,v 1.8 2017/01/24 03:57:35 dlg Exp $ */ +/* $OpenBSD: ifq.h,v 1.9 2017/01/24 10:08:30 krw Exp $ */ /* * Copyright (c) 2015 David Gwynne <dlg@openbsd.org> @@ -217,9 +217,9 @@ struct ifqueue { * A driver advertises it's ability to run its start routine by setting * the IFXF_MPSAFE flag in ifp->if_xflags before calling if_attach(): * - * ifp->if_xflags = IFXF_MPSAFE; - * ifp->if_start = drv_start; - * if_attach(ifp); + * ifp->if_xflags = IFXF_MPSAFE; + * ifp->if_start = drv_start; + * if_attach(ifp); * * The network stack will then wrap its calls to ifp->if_start with * ifq_start() to guarantee there is only one instance of that function @@ -246,56 +246,56 @@ struct ifqueue { * Drivers for hardware should use the following pattern to transmit * packets: * - * void - * drv_start(struct ifnet *ifp) - * { - * struct drv_softc *sc = ifp->if_softc; - * struct mbuf *m; - * int kick = 0; + * void + * drv_start(struct ifnet *ifp) + * { + * struct drv_softc *sc = ifp->if_softc; + * struct mbuf *m; + * int kick = 0; * - * if (NO_LINK) { - * ifq_purge(&ifp->if_snd); - * return; - * } + * if (NO_LINK) { + * ifq_purge(&ifp->if_snd); + * return; + * } * - * for (;;) { - * if (NO_SPACE) { - * ifq_set_oactive(&ifp->if_snd); - * break; - * } + * for (;;) { + * if (NO_SPACE) { + * ifq_set_oactive(&ifp->if_snd); + * break; + * } * - * m = ifq_dequeue(&ifp->if_snd); - * if (m == NULL) - * break; + * m = ifq_dequeue(&ifp->if_snd); + * if (m == NULL) + * break; * - * if (drv_encap(sc, m) != 0) { // map and fill ring - * m_freem(m); - * continue; - * } + * if (drv_encap(sc, m) != 0) { // map and fill ring + * m_freem(m); + * continue; + * } * - * bpf_mtap(); - * } + * bpf_mtap(); + * } * - * drv_kick(sc); // notify hw of new descriptors on the ring - * } + * drv_kick(sc); // notify hw of new descriptors on the ring + * } * * == Transmission completion * * The following pattern should be used for transmit queue interrupt * processing: * - * void - * drv_txeof(struct drv_softc *sc) - * { - * struct ifnet *ifp = &sc->sc_if; + * void + * drv_txeof(struct drv_softc *sc) + * { + * struct ifnet *ifp = &sc->sc_if; * - * while (COMPLETED_PKTS) { - * // unmap packets, m_freem() the mbufs. - * } + * while (COMPLETED_PKTS) { + * // unmap packets, m_freem() the mbufs. + * } * - * if (ifq_is_oactive(&ifp->if_snd)) - * ifq_restart(&ifp->if_snd); - * } + * if (ifq_is_oactive(&ifp->if_snd)) + * ifq_restart(&ifp->if_snd); + * } * * == Stop * @@ -303,21 +303,21 @@ struct ifqueue { * should clear IFF_RUNNING in ifp->if_flags, and guarantee the start * routine is not running before freeing any resources it uses: * - * void - * drv_down(struct drv_softc *sc) - * { - * struct ifnet *ifp = &sc->sc_if; + * void + * drv_down(struct drv_softc *sc) + * { + * struct ifnet *ifp = &sc->sc_if; * - * CLR(ifp->if_flags, IFF_RUNNING); - * DISABLE_INTERRUPTS(); + * CLR(ifp->if_flags, IFF_RUNNING); + * DISABLE_INTERRUPTS(); * - * ifq_barrier(&ifp->if_snd); - * intr_barrier(sc->sc_ih); + * ifq_barrier(&ifp->if_snd); + * intr_barrier(sc->sc_ih); * - * FREE_RESOURCES(); + * FREE_RESOURCES(); * - * ifq_clr_oactive(); - * } + * ifq_clr_oactive(); + * } * */ diff --git a/sys/net/pf_if.c b/sys/net/pf_if.c index 4b9c68eafc2..5069e85519a 100644 --- a/sys/net/pf_if.c +++ b/sys/net/pf_if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_if.c,v 1.88 2016/12/12 13:30:05 mpi Exp $ */ +/* $OpenBSD: pf_if.c,v 1.89 2017/01/24 10:08:30 krw Exp $ */ /* * Copyright 2005 Henning Brauer <henning@openbsd.org> @@ -214,7 +214,7 @@ pfi_kif_match(struct pfi_kif *rule_kif, struct pfi_kif *packet_kif) if (rule_kif->pfik_flags & PFI_IFLAG_ANY && packet_kif->pfik_ifp && !(packet_kif->pfik_ifp->if_flags & IFF_LOOPBACK)) - return (1); + return (1); return (0); } diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index 9a478bafe09..9b278c907f5 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.305 2016/11/16 08:46:05 mpi Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.306 2017/01/24 10:08:30 krw Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -540,11 +540,11 @@ pf_remove_queues(void) struct pf_queuespec *q; struct ifnet *ifp; - /* put back interfaces in normal queueing mode */ + /* put back interfaces in normal queueing mode */ TAILQ_FOREACH(q, pf_queues_active, entries) { if (q->parent_qid != 0) continue; - + ifp = q->kif->pfik_ifp; if (ifp == NULL) continue; @@ -1123,7 +1123,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) break; } - + case DIOCADDRULE: { struct pfioc_rule *pr = (struct pfioc_rule *)addr; struct pf_ruleset *ruleset; @@ -1612,7 +1612,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) bzero(pf_status.fcounters, sizeof(pf_status.fcounters)); bzero(pf_status.scounters, sizeof(pf_status.scounters)); pf_status.since = time_second; - + break; } diff --git a/sys/net/pf_table.c b/sys/net/pf_table.c index abb434c31e2..6cf6c45babb 100644 --- a/sys/net/pf_table.c +++ b/sys/net/pf_table.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_table.c,v 1.122 2017/01/23 09:08:24 mpi Exp $ */ +/* $OpenBSD: pf_table.c,v 1.123 2017/01/24 10:08:30 krw Exp $ */ /* * Copyright (c) 2002 Cedric Berger @@ -379,7 +379,7 @@ pfr_del_addrs(struct pfr_table *tbl, struct pfr_addr *addr, int size, * * one is O(N) and is better for large 'n' * one is O(n*LOG(N)) and is better for small 'n' - * + * * following code try to decide which one is best. */ for (i = kt->pfrkt_cnt; i > 0; i >>= 1) @@ -2478,9 +2478,9 @@ pfr_states_decrease(struct pfr_ktable *kt, struct pf_addr *addr, int af) return ke->pfrke_counters->states; } -/* +/* * Added for load balancing to find a kentry outside of the table. - * We need to create a custom pfr_addr struct. + * We need to create a custom pfr_addr struct. */ struct pfr_kentry * pfr_kentry_byaddr(struct pfr_ktable *kt, struct pf_addr *addr, sa_family_t af, @@ -2542,8 +2542,8 @@ pfr_dynaddr_update(struct pfr_ktable *kt, struct pfi_dynaddr *dyn) void pfr_ktable_winfo_update(struct pfr_ktable *kt, struct pfr_kentry *p) { - /* - * If cost flag is set, + /* + * If cost flag is set, * gcdweight is needed for round-robin. */ if (kt->pfrkt_refcntcost > 0) { diff --git a/sys/net/pfkey.c b/sys/net/pfkey.c index c6c50b7c6b7..e70a936b6b6 100644 --- a/sys/net/pfkey.c +++ b/sys/net/pfkey.c @@ -1,12 +1,12 @@ -/* $OpenBSD: pfkey.c,v 1.35 2017/01/23 16:31:24 bluhm Exp $ */ +/* $OpenBSD: pfkey.c,v 1.36 2017/01/24 10:08:30 krw Exp $ */ /* * @(#)COPYRIGHT 1.1 (NRL) 17 January 1995 - * + * * NRL grants permission for redistribution and use in source and binary * forms, with or without modification, of the software and documentation * created at NRL provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright @@ -14,14 +14,14 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgements: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * This product includes software developed at the Information - * Technology Division, US Naval Research Laboratory. + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * This product includes software developed at the Information + * Technology Division, US Naval Research Laboratory. * 4. Neither the name of the NRL nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THE SOFTWARE PROVIDED BY NRL IS PROVIDED BY NRL AND CONTRIBUTORS ``AS * IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A @@ -33,7 +33,7 @@ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * The views and conclusions contained in the software and documentation * are those of the authors and should not be interpreted as representing * official policies, either expressed or implied, of the US Naval diff --git a/sys/net/pfkeyv2.c b/sys/net/pfkeyv2.c index 058985bfeb2..62b59cd91c2 100644 --- a/sys/net/pfkeyv2.c +++ b/sys/net/pfkeyv2.c @@ -1,12 +1,12 @@ -/* $OpenBSD: pfkeyv2.c,v 1.149 2017/01/13 08:52:09 mpi Exp $ */ +/* $OpenBSD: pfkeyv2.c,v 1.150 2017/01/24 10:08:30 krw Exp $ */ /* * @(#)COPYRIGHT 1.1 (NRL) 17 January 1995 - * + * * NRL grants permission for redistribution and use in source and binary * forms, with or without modification, of the software and documentation * created at NRL provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright @@ -14,14 +14,14 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgements: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * This product includes software developed at the Information - * Technology Division, US Naval Research Laboratory. + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * This product includes software developed at the Information + * Technology Division, US Naval Research Laboratory. * 4. Neither the name of the NRL nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THE SOFTWARE PROVIDED BY NRL IS PROVIDED BY NRL AND CONTRIBUTORS ``AS * IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A @@ -33,7 +33,7 @@ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * The views and conclusions contained in the software and documentation * are those of the authors and should not be interpreted as representing * official policies, either expressed or implied, of the US Naval @@ -2126,7 +2126,7 @@ pfkeyv2_dump_policy(struct ipsec_policy *ipo, void **headers, void **buffer, headers[SADB_EXT_ADDRESS_SRC] = p; export_address(&p, (struct sockaddr *)&ipo->ipo_src); } - + /* Remote address. */ if (ipo->ipo_dst.sa.sa_family) { headers[SADB_EXT_ADDRESS_DST] = p; diff --git a/sys/net/pfkeyv2.h b/sys/net/pfkeyv2.h index 07fab0f7ed4..f2319b422e4 100644 --- a/sys/net/pfkeyv2.h +++ b/sys/net/pfkeyv2.h @@ -1,11 +1,11 @@ -/* $OpenBSD: pfkeyv2.h,v 1.72 2015/12/09 21:41:50 naddy Exp $ */ +/* $OpenBSD: pfkeyv2.h,v 1.73 2017/01/24 10:08:30 krw Exp $ */ /* * @(#)COPYRIGHT 1.1 (NRL) January 1998 - * + * * NRL grants permission for redistribution and use in source and binary * forms, with or without modification, of the software and documentation * created at NRL provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright @@ -13,14 +13,14 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgements: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * This product includes software developed at the Information - * Technology Division, US Naval Research Laboratory. + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * This product includes software developed at the Information + * Technology Division, US Naval Research Laboratory. * 4. Neither the name of the NRL nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THE SOFTWARE PROVIDED BY NRL IS PROVIDED BY NRL AND CONTRIBUTORS ``AS * IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A @@ -32,7 +32,7 @@ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * The views and conclusions contained in the software and documentation * are those of the authors and should not be interpreted as representing * official policies, either expressed or implied, of the US Naval diff --git a/sys/net/pfkeyv2_convert.c b/sys/net/pfkeyv2_convert.c index 49821decdbf..7a810e7edad 100644 --- a/sys/net/pfkeyv2_convert.c +++ b/sys/net/pfkeyv2_convert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkeyv2_convert.c,v 1.57 2015/12/09 21:41:50 naddy Exp $ */ +/* $OpenBSD: pfkeyv2_convert.c,v 1.58 2017/01/24 10:08:30 krw Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@keromytis.org) * @@ -25,11 +25,11 @@ /* * @(#)COPYRIGHT 1.1 (NRL) 17 January 1995 - * + * * NRL grants permission for redistribution and use in source and binary * forms, with or without modification, of the software and documentation * created at NRL provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright @@ -37,14 +37,14 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgements: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * This product includes software developed at the Information - * Technology Division, US Naval Research Laboratory. + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * This product includes software developed at the Information + * Technology Division, US Naval Research Laboratory. * 4. Neither the name of the NRL nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THE SOFTWARE PROVIDED BY NRL IS PROVIDED BY NRL AND CONTRIBUTORS ``AS * IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A @@ -56,7 +56,7 @@ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * The views and conclusions contained in the software and documentation * are those of the authors and should not be interpreted as representing * official policies, either expressed or implied, of the US Naval @@ -599,7 +599,7 @@ export_flow(void **p, u_int8_t ftype, struct sockaddr_encap *flow, sab->sadb_protocol_proto = 0; break; } - + switch (flow->sen_type) { case SENT_IP4: sab->sadb_protocol_direction = flow->sen_direction; diff --git a/sys/net/pfkeyv2_parsemessage.c b/sys/net/pfkeyv2_parsemessage.c index 433b9313cc5..8cb4b3cc327 100644 --- a/sys/net/pfkeyv2_parsemessage.c +++ b/sys/net/pfkeyv2_parsemessage.c @@ -1,12 +1,12 @@ -/* $OpenBSD: pfkeyv2_parsemessage.c,v 1.49 2015/04/14 12:22:15 mikeb Exp $ */ +/* $OpenBSD: pfkeyv2_parsemessage.c,v 1.50 2017/01/24 10:08:30 krw Exp $ */ /* * @(#)COPYRIGHT 1.1 (NRL) 17 January 1995 - * + * * NRL grants permission for redistribution and use in source and binary * forms, with or without modification, of the software and documentation * created at NRL provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright @@ -14,14 +14,14 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgements: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * This product includes software developed at the Information - * Technology Division, US Naval Research Laboratory. + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * This product includes software developed at the Information + * Technology Division, US Naval Research Laboratory. * 4. Neither the name of the NRL nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THE SOFTWARE PROVIDED BY NRL IS PROVIDED BY NRL AND CONTRIBUTORS ``AS * IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A @@ -33,7 +33,7 @@ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * The views and conclusions contained in the software and documentation * are those of the authors and should not be interpreted as representing * official policies, either expressed or implied, of the US Naval diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 7421caf04f8..9896bf82eca 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar.h,v 1.446 2016/12/29 13:01:48 bluhm Exp $ */ +/* $OpenBSD: pfvar.h,v 1.447 2017/01/24 10:08:30 krw Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -61,7 +61,7 @@ struct ip6_hdr; typedef struct refcnt pf_refcnt_t; #define PF_REF_INIT(_x) refcnt_init(&(_x)) #define PF_REF_TAKE(_x) refcnt_take(&(_x)) -#define PF_REF_RELE(_x) refcnt_rele(&(_x)) +#define PF_REF_RELE(_x) refcnt_rele(&(_x)) enum { PF_INOUT, PF_IN, PF_OUT, PF_FWD }; enum { PF_PASS, PF_DROP, PF_SCRUB, PF_NOSCRUB, PF_NAT, PF_NONAT, diff --git a/sys/net/pipex.c b/sys/net/pipex.c index 985dff245a7..7fad1490e28 100644 --- a/sys/net/pipex.c +++ b/sys/net/pipex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pipex.c,v 1.91 2016/12/19 15:51:53 mpi Exp $ */ +/* $OpenBSD: pipex.c,v 1.92 2017/01/24 10:08:30 krw Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -90,13 +90,13 @@ struct pipex_hash_head pipex_session_list, /* master session list */ pipex_close_wait_list, /* expired session list */ pipex_peer_addr_hashtable[PIPEX_HASH_SIZE], /* peer's address hash */ - pipex_id_hashtable[PIPEX_HASH_SIZE]; /* peer id hash */ + pipex_id_hashtable[PIPEX_HASH_SIZE]; /* peer id hash */ struct radix_node_head pipex_rd_head4; struct radix_node_head pipex_rd_head6; int pipex_rd_head4_initialized; int pipex_rd_head6_initialized; -struct timeout pipex_timer_ch; /* callout timer context */ +struct timeout pipex_timer_ch; /* callout timer context */ int pipex_prune = 1; /* walk list every seconds */ /* pipex traffic queue */ diff --git a/sys/net/pipex.h b/sys/net/pipex.h index 3a4ca768ad8..e823f7aac07 100644 --- a/sys/net/pipex.h +++ b/sys/net/pipex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pipex.h,v 1.20 2015/12/05 16:09:09 yasuoka Exp $ */ +/* $OpenBSD: pipex.h,v 1.21 2017/01/24 10:08:30 krw Exp $ */ /* * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -44,7 +44,7 @@ { "outq", CTLTYPE_NODE }, \ } -#define PIPEX_PROTO_L2TP 1 /* protocol L2TP */ +#define PIPEX_PROTO_L2TP 1 /* protocol L2TP */ #define PIPEX_PROTO_PPTP 2 /* protocol PPTP */ #define PIPEX_PROTO_PPPOE 3 /* protocol PPPoE */ #define PIPEX_MAX_LISTREQ 128 /* list request size */ @@ -63,7 +63,7 @@ struct pipex_statistics { uint32_t ipackets; /* packets received from tunnel */ uint32_t ierrors; /* error packets received from tunnel */ uint64_t ibytes; /* number of received bytes from tunnel */ - uint32_t opackets; /* packets sent to tunnel */ + uint32_t opackets; /* packets sent to tunnel */ uint32_t oerrors; /* error packets on sending to tunnel */ uint64_t obytes; /* number of sent bytes to tunnel */ @@ -88,8 +88,8 @@ struct pipex_session_req { #define PIPEX_PPP_INGRESS_FILTER 0x0200 /* do ingress filter */ int8_t pr_ccp_id; /* CCP current packet id */ int pr_ppp_id; /* PPP Id. */ - uint16_t pr_peer_mru; /* Peer's MRU */ - uint32_t pr_timeout_sec; /* Idle Timer */ + uint16_t pr_peer_mru; /* Peer's MRU */ + uint32_t pr_timeout_sec; /* Idle Timer */ struct in_addr pr_ip_srcaddr; /* local framed IP-Address */ struct in_addr pr_ip_address; /* framed IP-Address */ @@ -119,7 +119,7 @@ struct pipex_session_req { uint32_t ipsecflowinfo; /* IPsec flow id for NAT-T */ } l2tp; struct { - char over_ifname[IF_NAMESIZE]; /* ethernet ifname */ + char over_ifname[IF_NAMESIZE]; /* ethernet ifname */ } pppoe; } pr_proto; struct sockaddr_storage pr_peer_address; /* peer address of tunnel */ diff --git a/sys/net/pipex_local.h b/sys/net/pipex_local.h index 11b0b8ca215..f3f0e6886f4 100644 --- a/sys/net/pipex_local.h +++ b/sys/net/pipex_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pipex_local.h,v 1.23 2015/11/14 14:53:13 miod Exp $ */ +/* $OpenBSD: pipex_local.h,v 1.24 2017/01/24 10:08:30 krw Exp $ */ /* * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -47,7 +47,7 @@ #endif #define PIPEX_HASH_DIV 8 #define PIPEX_HASH_SIZE (PIPEX_MAX_SESSION/PIPEX_HASH_DIV) -#define PIPEX_HASH_MASK (PIPEX_HASH_SIZE-1) +#define PIPEX_HASH_MASK (PIPEX_HASH_SIZE-1) #define PIPEX_CLOSE_TIMEOUT 30 #define PIPEX_PPPMINLEN 5 /* minimum PPP header length is 1 and minimum ppp payload length is 4 */ @@ -84,7 +84,7 @@ struct pipex_pppoe_session { #ifdef PIPEX_PPTP struct pipex_pptp_session { /* sequence number gap between pipex and userland */ - int32_t snd_gap; /* gap of our sequence */ + int32_t snd_gap; /* gap of our sequence */ int32_t rcv_gap; /* gap of peer's sequence */ int32_t ul_snd_una; /* userland send acked seq */ @@ -296,13 +296,13 @@ extern struct pipex_hash_head pipex_id_hashtable[]; *(cp)++ = (u_char)(s); \ } while (0) -#define GETSHORT(s, cp) do { \ +#define GETSHORT(s, cp) do { \ (s) = *(cp)++ << 8; \ (s) |= *(cp)++; \ } while (0) #define PUTSHORT(s, cp) do { \ - *(cp)++ = (u_char) ((s) >> 8); \ + *(cp)++ = (u_char) ((s) >> 8); \ *(cp)++ = (u_char) (s); \ } while (0) diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c index 49157b78b60..c358b91c211 100644 --- a/sys/net/ppp_tty.c +++ b/sys/net/ppp_tty.c @@ -1,9 +1,9 @@ -/* $OpenBSD: ppp_tty.c,v 1.45 2016/12/19 15:57:30 mpi Exp $ */ +/* $OpenBSD: ppp_tty.c,v 1.46 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: ppp_tty.c,v 1.12 1997/03/24 21:23:10 christos Exp $ */ /* * ppp_tty.c - Point-to-Point Protocol (PPP) driver for asynchronous - * tty devices. + * tty devices. * * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved. * diff --git a/sys/net/radix.c b/sys/net/radix.c index 8176100eb2c..d3ad82df3d0 100644 --- a/sys/net/radix.c +++ b/sys/net/radix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radix.c,v 1.55 2016/11/14 08:54:19 mpi Exp $ */ +/* $OpenBSD: radix.c,v 1.56 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: radix.c,v 1.20 2003/08/07 16:32:56 agc Exp $ */ /* @@ -92,18 +92,18 @@ static inline void rn_swap_nodes(struct radix_node *, struct radix_node *); * We define the index of a route to associated with the mask to be * the first bit number in the mask where 0 occurs (with bit number 0 * representing the highest order bit). - * + * * We say a mask is normal if every bit is 0, past the index of the mask. * If a node n has a descendant (k, m) with index(m) == index(n) == rn_b, * and m is a normal mask, then the route applies to every descendant of n. * If the index(m) < rn_b, this implies the trailing last few bits of k * before bit b are all 0, (and hence consequently true of every descendant * of n), so the route applies to all descendants of the node as well. - * + * * Similar logic shows that a non-normal mask m such that * index(m) <= index(n) could potentially apply to many children of n. * Thus, for each non-host route, we attach its mask to a list at an internal - * node as high in the tree as we can go. + * node as high in the tree as we can go. * * The present version of the code makes use of normal routes in short- * circuiting an explicit mask and compare operation when testing whether @@ -824,7 +824,7 @@ rn_del_radix_mask(struct radix_node *tt) if (m->rm_leaf != tt) { if (--m->rm_refs >= 0) return (0); - else + else log(LOG_ERR, "rn_delete: " "inconsistent mklist refcount\n"); } diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c index 6214136a0d1..974db3afe78 100644 --- a/sys/net/raw_cb.c +++ b/sys/net/raw_cb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raw_cb.c,v 1.10 2016/09/05 16:07:01 claudio Exp $ */ +/* $OpenBSD: raw_cb.c,v 1.11 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: raw_cb.c,v 1.9 1996/02/13 22:00:39 christos Exp $ */ /* @@ -45,7 +45,7 @@ #include <netinet/in.h> /* - * Routines to manage the raw protocol control blocks. + * Routines to manage the raw protocol control blocks. * * TODO: * hash lookups by protocol family/protocol + address family diff --git a/sys/net/route.c b/sys/net/route.c index 1d209e311ae..52e7d3813de 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -1,10 +1,10 @@ -/* $OpenBSD: route.c,v 1.348 2017/01/24 04:45:35 phessler Exp $ */ +/* $OpenBSD: route.c,v 1.349 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -16,7 +16,7 @@ * 3. Neither the name of the project nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -63,11 +63,11 @@ /* * @(#)COPYRIGHT 1.1 (NRL) 17 January 1995 - * + * * NRL grants permission for redistribution and use in source and binary * forms, with or without modification, of the software and documentation * created at NRL provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright @@ -75,14 +75,14 @@ * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgements: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * This product includes software developed at the Information - * Technology Division, US Naval Research Laboratory. + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * This product includes software developed at the Information + * Technology Division, US Naval Research Laboratory. * 4. Neither the name of the NRL nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THE SOFTWARE PROVIDED BY NRL IS PROVIDED BY NRL AND CONTRIBUTORS ``AS * IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A @@ -94,7 +94,7 @@ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * The views and conclusions contained in the software and documentation * are those of the authors and should not be interpreted as representing * official policies, either expressed or implied, of the US Naval @@ -218,8 +218,8 @@ rtisvalid(struct rtentry *rt) if (ISSET(rt->rt_flags, RTF_GATEWAY)) { KASSERT(rt->rt_gwroute != NULL); - KASSERT(!ISSET(rt->rt_gwroute->rt_flags, RTF_GATEWAY)); - if (!ISSET(rt->rt_gwroute->rt_flags, RTF_UP)) + KASSERT(!ISSET(rt->rt_gwroute->rt_flags, RTF_GATEWAY)); + if (!ISSET(rt->rt_gwroute->rt_flags, RTF_UP)) return (0); } @@ -285,12 +285,12 @@ rt_match(struct sockaddr *dst, uint32_t *src, int flags, unsigned int tableid) */ #define mix(a, b, c) do { \ a -= b; a -= c; a ^= (c >> 13); \ - b -= c; b -= a; b ^= (a << 8); \ + b -= c; b -= a; b ^= (a << 8); \ c -= a; c -= b; c ^= (b >> 13); \ a -= b; a -= c; a ^= (c >> 12); \ b -= c; b -= a; b ^= (a << 16); \ - c -= a; c -= b; c ^= (b >> 5); \ - a -= b; a -= c; a ^= (c >> 3); \ + c -= a; c -= b; c ^= (b >> 5); \ + a -= b; a -= c; a ^= (c >> 3); \ b -= c; b -= a; b ^= (a << 10); \ c -= a; c -= b; c ^= (b >> 15); \ } while (0) @@ -551,7 +551,7 @@ rtredirect(struct sockaddr *dst, struct sockaddr *gateway, struct rt_addrinfo info; struct ifaddr *ifa; unsigned int ifidx = 0; - int flags = RTF_GATEWAY|RTF_HOST; + int flags = RTF_GATEWAY|RTF_HOST; uint8_t prio = RTP_NONE; NET_ASSERT_LOCKED(); @@ -1020,7 +1020,7 @@ rtrequest(int req, struct rt_addrinfo *info, u_int8_t prio, } #ifdef MPLS - /* We have to allocate additional space for MPLS infos */ + /* We have to allocate additional space for MPLS infos */ if (info->rti_flags & RTF_MPLS && (info->rti_info[RTAX_SRC] != NULL || info->rti_info[RTAX_DST]->sa_family == AF_MPLS)) { @@ -1449,7 +1449,7 @@ static int rt_init_done = 0; } \ } -/* +/* * Some subtle order problems with domain initialization mean that * we cannot count on this being run from rt_init before various * protocol initializations are done. Therefore, we make sure @@ -1736,7 +1736,7 @@ rt_if_linkstate_change(struct rtentry *rt, void *arg, u_int id) struct sockaddr_in6 sa_mask; if (rt->rt_ifidx != ifp->if_index) - return (0); + return (0); /* Local routes are always usable. */ if (rt->rt_flags & RTF_LOCAL) { diff --git a/sys/net/rtable.c b/sys/net/rtable.c index b8012deb648..74025a58487 100644 --- a/sys/net/rtable.c +++ b/sys/net/rtable.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtable.c,v 1.56 2016/11/20 11:46:45 mpi Exp $ */ +/* $OpenBSD: rtable.c,v 1.57 2017/01/24 10:08:30 krw Exp $ */ /* * Copyright (c) 2014-2016 Martin Pieuchot @@ -46,7 +46,7 @@ * ----------- `. .---------. .---------. * ... `----> | rtable0 | ... | rtableN | Array of pointers for * ----------- '---------' '---------' IPv4 routing tables - * | AF_MPLS | indexed by ``rtableid''. + * | AF_MPLS | indexed by ``rtableid''. * ----------- */ struct srp *afmap; @@ -941,7 +941,7 @@ rtable_mpath_insert(struct art_node *an, struct rtentry *rt) while (SRPL_NEXT_LOCKED(mrt, rt_next) != NULL) { if (mrt->rt_priority > prio) break; - prt = mrt; + prt = mrt; mrt = SRPL_NEXT_LOCKED(mrt, rt_next); } diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h index 62d03779c65..fcc7f4abbd5 100644 --- a/sys/net/slcompress.h +++ b/sys/net/slcompress.h @@ -1,4 +1,4 @@ -/* $OpenBSD: slcompress.h,v 1.9 2013/10/24 18:50:16 deraadt Exp $ */ +/* $OpenBSD: slcompress.h,v 1.10 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: slcompress.h,v 1.11 1997/05/17 21:12:11 christos Exp $ */ /* @@ -57,7 +57,7 @@ * sequence number changes, one change per bit set in the header * (there may be no changes and there are two special cases where * the receiver implicitly knows what changed -- see below). - * + * * There are 5 numbers which can change (they are always inserted * in the following order): TCP urgent pointer, window, * acknowledgement, sequence number and IP ID. (The urgent pointer @@ -158,10 +158,10 @@ struct slcompress { void sl_compress_init(struct slcompress *); void sl_compress_setup(struct slcompress *, int); u_int sl_compress_tcp(struct mbuf *, - struct ip *, struct slcompress *, int); + struct ip *, struct slcompress *, int); int sl_uncompress_tcp(u_char **, int, u_int, struct slcompress *); int sl_uncompress_tcp_core(u_char *, int, int, u_int, - struct slcompress *, u_char **, u_int *); + struct slcompress *, u_char **, u_int *); #endif /* _KERNEL */ #endif /* _NET_SLCOMPRESS_H_ */ diff --git a/sys/net/trunklacp.c b/sys/net/trunklacp.c index cf825002060..52ca84f6514 100644 --- a/sys/net/trunklacp.c +++ b/sys/net/trunklacp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trunklacp.c,v 1.28 2015/11/24 15:17:26 mpi Exp $ */ +/* $OpenBSD: trunklacp.c,v 1.29 2017/01/24 10:08:30 krw Exp $ */ /* $NetBSD: ieee8023ad_lacp.c,v 1.3 2005/12/11 12:24:54 christos Exp $ */ /* $FreeBSD:ieee8023ad_lacp.c,v 1.15 2008/03/16 19:25:30 thompsa Exp $ */ @@ -1704,7 +1704,7 @@ lacp_marker_input(struct lacp_port *lp, struct mbuf *m) LACP_DPRINTF((lp, "marker response, port=%u, sys=%s, id=%u\n", ntohs(mdu->mdu_info.mi_rq_port), - ether_sprintf(mdu->mdu_info.mi_rq_system), + ether_sprintf(mdu->mdu_info.mi_rq_system), ntohl(mdu->mdu_info.mi_rq_xid))); /* Verify that it is the last marker we sent out */ |