CVS commit: xsrc/external/mit/libXrandr/dist/src
Module Name:xsrc Committed By: christos Date: Mon Oct 10 02:52:02 UTC 2016 Modified Files: xsrc/external/mit/libXrandr/dist/src: XrrProvider.c Log Message: avoid unsigned < 0 comparisons To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libXrandr/dist/src/XrrProvider.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libXrandr/dist/src/XrrProvider.c diff -u xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.8 xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.9 --- xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.8 Fri Oct 7 11:52:35 2016 +++ xsrc/external/mit/libXrandr/dist/src/XrrProvider.c Sun Oct 9 22:52:02 2016 @@ -104,7 +104,8 @@ XRRFreeProviderResources(XRRProviderReso free(provider_resources); } -#define ProviderInfoExtra (SIZEOF(xRRGetProviderInfoReply) - 32) +#define ProviderInfoExtra (SIZEOF(xRRGetProviderInfoReply) - 32) +#define ProviderInfoExtraWords (ProviderInfoExtra >> 2) XRRProviderInfo * XRRGetProviderInfo(Display *dpy, XRRScreenResources *resources, RRProvider provider) { @@ -123,19 +124,25 @@ XRRGetProviderInfo(Display *dpy, XRRScre req->provider = provider; req->configTimestamp = resources->configTimestamp; -if (!_XReply (dpy, (xReply *) &rep, ProviderInfoExtra >> 2, xFalse)) +if (!_XReply (dpy, (xReply *) &rep, ProviderInfoExtraWords, xFalse)) { UnlockDisplay (dpy); SyncHandle (); return NULL; } -if (rep.length > (INT_MAX >> 2) || rep.length < (ProviderInfoExtra >> 2)) +if (rep.length > (INT_MAX >> 2) +#if ProviderInfoExtraWords > 0 + || rep.length < ProviderInfoExtraWords +#endif +) { - if (rep.length < (ProviderInfoExtra >> 2)) +#if ProviderInfoExtraWords > 0 + if (rep.length < ProviderInfoExtraWords) _XEatDataWords (dpy, rep.length); else - _XEatDataWords (dpy, rep.length - (ProviderInfoExtra >> 2)); +#endif + _XEatDataWords (dpy, rep.length - ProviderInfoExtraWords); UnlockDisplay (dpy); SyncHandle (); return NULL;
CVS commit: src/sys/kern
Module Name:src Committed By: dholland Date: Mon Oct 10 01:22:51 UTC 2016 Modified Files: src/sys/kern: uipc_socket.c Log Message: foo & ~bar, not foo &~ bar. From Henning Petersen in PR 49636. To generate a diff of this commit: cvs rdiff -u -r1.250 -r1.251 src/sys/kern/uipc_socket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/uipc_socket.c diff -u src/sys/kern/uipc_socket.c:1.250 src/sys/kern/uipc_socket.c:1.251 --- src/sys/kern/uipc_socket.c:1.250 Mon Oct 10 01:22:08 2016 +++ src/sys/kern/uipc_socket.c Mon Oct 10 01:22:51 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.250 2016/10/10 01:22:08 dholland Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.251 2016/10/10 01:22:51 dholland Exp $ */ /*- * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.250 2016/10/10 01:22:08 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.251 2016/10/10 01:22:51 dholland Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -1175,7 +1175,7 @@ soreceive(struct socket *so, struct mbuf if (controlp != NULL) *controlp = NULL; if (flagsp != NULL) - flags = *flagsp &~ MSG_EOR; + flags = *flagsp & ~MSG_EOR; else flags = 0;
CVS commit: src/sys/kern
Module Name:src Committed By: dholland Date: Mon Oct 10 01:22:08 UTC 2016 Modified Files: src/sys/kern: uipc_socket.c Log Message: PR 49636 Henning Petersen: use "0L" to return 0 from a function returning long, and test its returned value against "0L" instead of "0". This is not especially necessary, but it's also harmless. To generate a diff of this commit: cvs rdiff -u -r1.249 -r1.250 src/sys/kern/uipc_socket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/uipc_socket.c diff -u src/sys/kern/uipc_socket.c:1.249 src/sys/kern/uipc_socket.c:1.250 --- src/sys/kern/uipc_socket.c:1.249 Sun Oct 2 19:26:46 2016 +++ src/sys/kern/uipc_socket.c Mon Oct 10 01:22:08 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.249 2016/10/02 19:26:46 christos Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.250 2016/10/10 01:22:08 dholland Exp $ */ /*- * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.249 2016/10/02 19:26:46 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.250 2016/10/10 01:22:08 dholland Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -346,7 +346,7 @@ sosend_loan(struct socket *so, struct ui int i; if (VMSPACE_IS_KERNEL_P(uio->uio_vmspace)) - return (0); + return 0L; if (iov->iov_len < (size_t) space) space = iov->iov_len; @@ -362,13 +362,13 @@ sosend_loan(struct socket *so, struct ui lva = sokvaalloc(sva, len, so); if (lva == 0) - return 0; + return 0L; error = uvm_loan(&uio->uio_vmspace->vm_map, sva, len, m->m_ext.ext_pgs, UVM_LOAN_TOPAGE); if (error) { sokvafree(lva, len); - return (0); + return 0L; } for (i = 0, va = lva; i < npgs; i++, va += PAGE_SIZE) @@ -1008,7 +1008,7 @@ sosend(struct socket *so, struct sockadd uio->uio_iov->iov_len >= sock_loan_thresh && space >= sock_loan_thresh && (len = sosend_loan(so, uio, m, - space)) != 0) { + space)) != 0L) { SOSEND_COUNTER_INCR(&sosend_loan_big); space -= len; goto have_data;
CVS commit: src/sbin/mount
Module Name:src Committed By: christos Date: Sun Oct 9 21:03:43 UTC 2016 Modified Files: src/sbin/mount: mount.c Log Message: try to be more clear about what is not found. To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/sbin/mount/mount.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount/mount.c diff -u src/sbin/mount/mount.c:1.101 src/sbin/mount/mount.c:1.102 --- src/sbin/mount/mount.c:1.101 Sat Oct 8 02:47:59 2016 +++ src/sbin/mount/mount.c Sun Oct 9 17:03:43 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: mount.c,v 1.101 2016/10/08 06:47:59 maya Exp $ */ +/* $NetBSD: mount.c,v 1.102 2016/10/09 21:03:43 christos Exp $ */ /* * Copyright (c) 1980, 1989, 1993, 1994 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19 #if 0 static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95"; #else -__RCSID("$NetBSD: mount.c,v 1.101 2016/10/08 06:47:59 maya Exp $"); +__RCSID("$NetBSD: mount.c,v 1.102 2016/10/09 21:03:43 christos Exp $"); #endif #endif /* not lint */ @@ -503,7 +503,7 @@ mountfs(const char *vfstype, const char } while (*++edir != NULL); if (errno == ENOENT) - warnx("%s not found", execbase); + warn("exec %s for %s: %s", execbase, name, execbase); _exit(1); /* NOTREACHED */
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: christos Date: Sun Oct 9 19:38:08 UTC 2016 Modified Files: src/external/bsd/dhcpcd/dist: ipv6nd.c Log Message: make DEBUG_NS compile. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/external/bsd/dhcpcd/dist/ipv6nd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/dhcpcd/dist/ipv6nd.c diff -u src/external/bsd/dhcpcd/dist/ipv6nd.c:1.33 src/external/bsd/dhcpcd/dist/ipv6nd.c:1.34 --- src/external/bsd/dhcpcd/dist/ipv6nd.c:1.33 Sun Oct 9 05:18:26 2016 +++ src/external/bsd/dhcpcd/dist/ipv6nd.c Sun Oct 9 15:38:08 2016 @@ -1,5 +1,5 @@ #include - __RCSID("$NetBSD: ipv6nd.c,v 1.33 2016/10/09 09:18:26 roy Exp $"); + __RCSID("$NetBSD: ipv6nd.c,v 1.34 2016/10/09 19:38:08 christos Exp $"); /* * dhcpcd - DHCP client daemon @@ -1487,8 +1487,8 @@ ipv6nd_handlena(struct dhcpcd_ctx *dctx, if (ifp == NULL) { #ifdef DEBUG_NS - logger(ctx, LOG_DEBUG, "NA for unexpected interface from %s", - dctx->sfrom); + logger(dctx, LOG_DEBUG, "NA for unexpected interface from %s", + ctx->sfrom); #endif return; }
CVS commit: xsrc/external/mit/xf86-video-siliconmotion/dist/src
Module Name:xsrc Committed By: macallan Date: Sun Oct 9 19:04:06 UTC 2016 Modified Files: xsrc/external/mit/xf86-video-siliconmotion/dist/src: smi_driver.c Log Message: default to EXA if no AccelMethod option is given To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c diff -u xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.7 xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.8 --- xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.7 Thu Sep 8 05:25:49 2016 +++ xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c Sun Oct 9 19:04:06 2016 @@ -744,6 +744,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags char *strptr; from = X_DEFAULT; + pSmi->useEXA = TRUE; if ((strptr = (char *)xf86GetOptValString(pSmi->Options, OPTION_ACCELMETHOD))) { if (!xf86NameCmp(strptr,"XAA")) {
CVS commit: src/lib/libc_fp/arch/mips
Module Name:src Committed By: macallan Date: Sun Oct 9 17:18:32 UTC 2016 Modified Files: src/lib/libc_fp/arch/mips: Makefile.inc Log Message: fix tpyo To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc_fp/arch/mips/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc_fp/arch/mips/Makefile.inc diff -u src/lib/libc_fp/arch/mips/Makefile.inc:1.1 src/lib/libc_fp/arch/mips/Makefile.inc:1.2 --- src/lib/libc_fp/arch/mips/Makefile.inc:1.1 Thu Jul 14 01:59:18 2016 +++ src/lib/libc_fp/arch/mips/Makefile.inc Sun Oct 9 17:18:32 2016 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.inc,v 1.1 2016/07/14 01:59:18 matt Exp $ +# $NetBSD: Makefile.inc,v 1.2 2016/10/09 17:18:32 macallan Exp $ # CPUFLAGS+= -mhard-float SRCS= fpsf.S fpdf.S -AFLAGS.vfpsf.S+= -mhard-float -AFLAGS.vfpdf.S+= -mhard-float +AFLAGS.fpsf.S+= -mhard-float +AFLAGS.fpdf.S+= -mhard-float
CVS commit: src/crypto/external/bsd/heimdal/dist/kdc
Module Name:src Committed By: christos Date: Sun Oct 9 15:01:49 UTC 2016 Modified Files: src/crypto/external/bsd/heimdal/dist/kdc: kerberos5.c Log Message: PR/51543: Henning Petersen: replace , with ; To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c diff -u src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.5 src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.6 --- src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.5 Thu Apr 24 09:45:34 2014 +++ src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c Sun Oct 9 11:01:49 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: kerberos5.c,v 1.5 2014/04/24 13:45:34 pettai Exp $ */ +/* $NetBSD: kerberos5.c,v 1.6 2016/10/09 15:01:49 christos Exp $ */ /* * Copyright (c) 1997-2007 Kungliga Tekniska Högskolan @@ -1455,7 +1455,7 @@ _kdc_as_rep(krb5_context context, e_data.data = buf; e_data.length = len; - e_text ="Need to use PA-ENC-TIMESTAMP/PA-PK-AS-REQ", + e_text ="Need to use PA-ENC-TIMESTAMP/PA-PK-AS-REQ"; ret = KRB5KDC_ERR_PREAUTH_REQUIRED;
CVS commit: src/external/bsd/bind/dist/bin/named
Module Name:src Committed By: christos Date: Sun Oct 9 14:53:54 UTC 2016 Modified Files: src/external/bsd/bind/dist/bin/named: xfrout.c Log Message: PR/51542: Henning Petersen: replace , with ; To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/bsd/bind/dist/bin/named/xfrout.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/bind/dist/bin/named/xfrout.c diff -u src/external/bsd/bind/dist/bin/named/xfrout.c:1.11 src/external/bsd/bind/dist/bin/named/xfrout.c:1.12 --- src/external/bsd/bind/dist/bin/named/xfrout.c:1.11 Thu May 26 12:49:56 2016 +++ src/external/bsd/bind/dist/bin/named/xfrout.c Sun Oct 9 10:53:54 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: xfrout.c,v 1.11 2016/05/26 16:49:56 christos Exp $ */ +/* $NetBSD: xfrout.c,v 1.12 2016/10/09 14:53:54 christos Exp $ */ /* * Copyright (C) 2004-2015 Internet Systems Consortium, Inc. ("ISC") @@ -1186,7 +1186,7 @@ xfrout_ctx_create(isc_mem_t *mctx, ns_cl xfr->txmem = NULL; xfr->txmemlen = 0; xfr->nmsg = 0; - xfr->many_answers = many_answers, + xfr->many_answers = many_answers; xfr->sends = 0; xfr->shuttingdown = ISC_FALSE; xfr->mnemonic = NULL;
CVS commit: src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp
Module Name:src Committed By: christos Date: Sun Oct 9 14:52:50 UTC 2016 Modified Files: src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp: nouveau_engine_disp_dport.c Log Message: PR/51541: Henning Petersen: replace , with ; To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_dport.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_dport.c diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_dport.c:1.1.1.1 src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_dport.c:1.2 --- src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_dport.c:1.1.1.1 Wed Aug 6 08:36:24 2014 +++ src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/disp/nouveau_engine_disp_dport.c Sun Oct 9 10:52:50 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: nouveau_engine_disp_dport.c,v 1.1.1.1 2014/08/06 12:36:24 riastradh Exp $ */ +/* $NetBSD: nouveau_engine_disp_dport.c,v 1.2 2016/10/09 14:52:50 christos Exp $ */ /* * Copyright 2013 Red Hat Inc. @@ -25,7 +25,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_disp_dport.c,v 1.1.1.1 2014/08/06 12:36:24 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_disp_dport.c,v 1.2 2016/10/09 14:52:50 christos Exp $"); #include #include @@ -262,7 +262,7 @@ dp_link_train_fini(struct dp_state *dp) }; /* post-train script */ - init.offset = dp->info.script[1], + init.offset = dp->info.script[1]; nvbios_exec(&init); }
CVS commit: src/sys/uvm/pmap
Module Name:src Committed By: christos Date: Sun Oct 9 14:51:50 UTC 2016 Modified Files: src/sys/uvm/pmap: pmap_tlb.c Log Message: PR/51540: Henning Petersen: replace , with ; To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/uvm/pmap/pmap_tlb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/uvm/pmap/pmap_tlb.c diff -u src/sys/uvm/pmap/pmap_tlb.c:1.18 src/sys/uvm/pmap/pmap_tlb.c:1.19 --- src/sys/uvm/pmap/pmap_tlb.c:1.18 Sat Jul 23 16:06:25 2016 +++ src/sys/uvm/pmap/pmap_tlb.c Sun Oct 9 10:51:50 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_tlb.c,v 1.18 2016/07/23 20:06:25 matt Exp $ */ +/* $NetBSD: pmap_tlb.c,v 1.19 2016/10/09 14:51:50 christos Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.18 2016/07/23 20:06:25 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.19 2016/10/09 14:51:50 christos Exp $"); /* * Manages address spaces in a TLB. @@ -338,7 +338,7 @@ pmap_tlb_info_init(struct pmap_tlb_info ti->ti_asid_hint = KERNEL_PID + 1; ti->ti_asid_max = pmap_tlbs[0]->ti_asid_max; ti->ti_asids_free = ti->ti_asid_max - KERNEL_PID; - ti->ti_tlbinvop = TLBINV_NOBODY, + ti->ti_tlbinvop = TLBINV_NOBODY; ti->ti_victim = NULL; kcpuset_create(&ti->ti_kcpuset, true); ti->ti_index = pmap_ntlbs++;
CVS commit: src/sys/arch/atari/stand/ahdilabel
Module Name:src Committed By: christos Date: Sun Oct 9 14:51:26 UTC 2016 Modified Files: src/sys/arch/atari/stand/ahdilabel: ahdilabel.c Log Message: PR/51540: Henning Petersen: replace , with ; To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/atari/stand/ahdilabel/ahdilabel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/atari/stand/ahdilabel/ahdilabel.c diff -u src/sys/arch/atari/stand/ahdilabel/ahdilabel.c:1.10 src/sys/arch/atari/stand/ahdilabel/ahdilabel.c:1.11 --- src/sys/arch/atari/stand/ahdilabel/ahdilabel.c:1.10 Fri Mar 28 09:35:13 2014 +++ src/sys/arch/atari/stand/ahdilabel/ahdilabel.c Sun Oct 9 10:51:26 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: ahdilabel.c,v 1.10 2014/03/28 13:35:13 ozaki-r Exp $ */ +/* $NetBSD: ahdilabel.c,v 1.11 2016/10/09 14:51:26 christos Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -262,7 +262,7 @@ show_parts (struct ahdi_ptable *ptable, printf ("%5u/%2u/%3u ", cylinder, track, sector); sector = ptable->parts[i].start + (ptable->parts[i].size ? - ptable->parts[i].size - 1 : 0), + ptable->parts[i].size - 1 : 0); cylinder = sector / ptable->secpercyl; sector -= cylinder * ptable->secpercyl; track = sector / ptable->nsectors;
CVS commit: src/sys/dev/marvell
Module Name:src Committed By: christos Date: Sun Oct 9 14:50:54 UTC 2016 Modified Files: src/sys/dev/marvell: gt.c Log Message: PR/51540: Henning Petersen: replace , with ; To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/marvell/gt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/marvell/gt.c diff -u src/sys/dev/marvell/gt.c:1.27 src/sys/dev/marvell/gt.c:1.28 --- src/sys/dev/marvell/gt.c:1.27 Sat Jul 11 06:32:46 2015 +++ src/sys/dev/marvell/gt.c Sun Oct 9 10:50:54 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: gt.c,v 1.27 2015/07/11 10:32:46 kamil Exp $ */ +/* $NetBSD: gt.c,v 1.28 2016/10/09 14:50:54 christos Exp $ */ /* * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc. @@ -42,7 +42,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.27 2015/07/11 10:32:46 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.28 2016/10/09 14:50:54 christos Exp $"); #include "opt_marvell.h" #include "gtmpsc.h" @@ -807,7 +807,7 @@ gt_watchdog_init(struct gt_softc *gt) gt_write(gt, GT_WDOG_Config, GT_WDOG_Config_Ctl1a|GT_WDOG_Preset_DFLT); gt_write(gt, GT_WDOG_Config, GT_WDOG_Config_Ctl1b|GT_WDOG_Preset_DFLT); - r = gt_read(gt, GT_WDOG_Config), + r = gt_read(gt, GT_WDOG_Config); aprint_normal(" status %#x,%#x: %s\n", r, gt_read(gt, GT_WDOG_Value), ((r & GT_WDOG_Config_Enb) != 0) ? "enabled" : "botch");
CVS commit: src/sys/dev/marvell
Module Name:src Committed By: christos Date: Sun Oct 9 14:49:51 UTC 2016 Modified Files: src/sys/dev/marvell: mvspi.c Log Message: PR/51540: Henning Petersen: replace , with ; To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/marvell/mvspi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/marvell/mvspi.c diff -u src/sys/dev/marvell/mvspi.c:1.3 src/sys/dev/marvell/mvspi.c:1.4 --- src/sys/dev/marvell/mvspi.c:1.3 Sun Dec 13 13:35:26 2015 +++ src/sys/dev/marvell/mvspi.c Sun Oct 9 10:49:51 2016 @@ -130,7 +130,7 @@ mvspi_attach(struct device *parent, stru ctl &= MVSPI_DIRHS_MASK; ctl &= MVSPI_1BYTE_MASK; - PUTREG(sc, MVSPI_INTCONF_REG, ctl), + PUTREG(sc, MVSPI_INTCONF_REG, ctl); /* * Initialize SPI controller.
CVS commit: src/sys/net80211
Module Name:src Committed By: christos Date: Sun Oct 9 14:50:20 UTC 2016 Modified Files: src/sys/net80211: ieee80211_crypto_wep.c Log Message: PR/51540: Henning Petersen: replace , with ; To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/net80211/ieee80211_crypto_wep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net80211/ieee80211_crypto_wep.c diff -u src/sys/net80211/ieee80211_crypto_wep.c:1.8 src/sys/net80211/ieee80211_crypto_wep.c:1.9 --- src/sys/net80211/ieee80211_crypto_wep.c:1.8 Wed Dec 17 15:51:37 2008 +++ src/sys/net80211/ieee80211_crypto_wep.c Sun Oct 9 10:50:20 2016 @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto_wep.c,v 1.7 2005/06/10 16:11:24 sam Exp $"); #endif #ifdef __NetBSD__ -__KERNEL_RCSID(0, "$NetBSD: ieee80211_crypto_wep.c,v 1.8 2008/12/17 20:51:37 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ieee80211_crypto_wep.c,v 1.9 2016/10/09 14:50:20 christos Exp $"); #endif /* @@ -421,7 +421,7 @@ wep_decrypt(struct ieee80211_key *key, s } off = hdrlen + wep.ic_header; - data_len = m->m_pkthdr.len - (off + wep.ic_trailer), + data_len = m->m_pkthdr.len - (off + wep.ic_trailer); /* Compute CRC32 over unencrypted data and apply RC4 to data */ crc = ~0;
CVS commit: src/sys/arch/arm/sa11x0
Module Name:src Committed By: christos Date: Sun Oct 9 14:43:17 UTC 2016 Modified Files: src/sys/arch/arm/sa11x0: sa11x0_ost.c Log Message: PR/51540: Henning Petersen: replace , with ; To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/sa11x0/sa11x0_ost.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/sa11x0/sa11x0_ost.c diff -u src/sys/arch/arm/sa11x0/sa11x0_ost.c:1.31 src/sys/arch/arm/sa11x0/sa11x0_ost.c:1.32 --- src/sys/arch/arm/sa11x0/sa11x0_ost.c:1.31 Mon Dec 16 20:29:39 2013 +++ src/sys/arch/arm/sa11x0/sa11x0_ost.c Sun Oct 9 10:43:17 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: sa11x0_ost.c,v 1.31 2013/12/17 01:29:39 joerg Exp $ */ +/* $NetBSD: sa11x0_ost.c,v 1.32 2016/10/09 14:43:17 christos Exp $ */ /* * Copyright (c) 1997 Mark Brinicombe. @@ -38,7 +38,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sa11x0_ost.c,v 1.31 2013/12/17 01:29:39 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sa11x0_ost.c,v 1.32 2016/10/09 14:43:17 christos Exp $"); #include #include @@ -276,7 +276,7 @@ saost_tc_init(void) }; #if defined(CPU_XSCALE_PXA270) && defined(CPU_XSCALE_PXA250) - saost_tc.tc_frequency = TIMER_FREQUENCY, + saost_tc.tc_frequency = TIMER_FREQUENCY; #endif tc_init(&saost_tc); }
CVS commit: src/sys/dev/ic
Module Name:src Committed By: christos Date: Sun Oct 9 14:42:31 UTC 2016 Modified Files: src/sys/dev/ic: rtwphyio.c Log Message: PR/51540: Henning Petersen: replace , with ; To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/dev/ic/rtwphyio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/rtwphyio.c diff -u src/sys/dev/ic/rtwphyio.c:1.18 src/sys/dev/ic/rtwphyio.c:1.19 --- src/sys/dev/ic/rtwphyio.c:1.18 Sat Sep 14 09:09:18 2013 +++ src/sys/dev/ic/rtwphyio.c Sun Oct 9 10:42:30 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: rtwphyio.c,v 1.18 2013/09/14 13:09:18 joerg Exp $ */ +/* $NetBSD: rtwphyio.c,v 1.19 2016/10/09 14:42:30 christos Exp $ */ /*- * Copyright (c) 2004, 2005 David Young. All rights reserved. * @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rtwphyio.c,v 1.18 2013/09/14 13:09:18 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtwphyio.c,v 1.19 2016/10/09 14:42:30 christos Exp $"); #include #include @@ -85,7 +85,7 @@ rtw_bbp_write(struct rtw_regs *regs, u_i KASSERT((val & ~__SHIFTOUT_MASK(RTW_BB_WR_MASK)) == 0); wrbbp = __SHIFTIN(addr, RTW_BB_ADDR_MASK) | RTW_BB_WREN | - __SHIFTIN(val, RTW_BB_WR_MASK) | RTW_BB_RD_MASK, + __SHIFTIN(val, RTW_BB_WR_MASK) | RTW_BB_RD_MASK; rdbbp = __SHIFTIN(addr, RTW_BB_ADDR_MASK) | RTW_BB_WR_MASK | RTW_BB_RD_MASK;
CVS commit: src/sys/arch/dreamcast/dev/g2
Module Name:src Committed By: christos Date: Sun Oct 9 14:41:47 UTC 2016 Modified Files: src/sys/arch/dreamcast/dev/g2: g2rtc.c Log Message: PR/51540: Henning Petersen: replace , with ; To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/dreamcast/dev/g2/g2rtc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/dreamcast/dev/g2/g2rtc.c diff -u src/sys/arch/dreamcast/dev/g2/g2rtc.c:1.7 src/sys/arch/dreamcast/dev/g2/g2rtc.c:1.8 --- src/sys/arch/dreamcast/dev/g2/g2rtc.c:1.7 Sun Nov 16 21:15:48 2014 +++ src/sys/arch/dreamcast/dev/g2/g2rtc.c Sun Oct 9 10:41:47 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: g2rtc.c,v 1.7 2014/11/17 02:15:48 christos Exp $ */ +/* $NetBSD: g2rtc.c,v 1.8 2016/10/09 14:41:47 christos Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: g2rtc.c,v 1.7 2014/11/17 02:15:48 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: g2rtc.c,v 1.8 2016/10/09 14:41:47 christos Exp $"); #include #include @@ -99,8 +99,8 @@ g2rtc_attach(device_t parent, device_t s tch = &sc->sc_tch; tch->cookie = sc; - tch->todr_gettime = g2rtc_todr_gettime, - tch->todr_settime = g2rtc_todr_settime, + tch->todr_gettime = g2rtc_todr_gettime; + tch->todr_settime = g2rtc_todr_settime; todr_attach(tch); }
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5416
Module Name:src Committed By: christos Date: Sun Oct 9 14:40:47 UTC 2016 Modified Files: src/sys/external/isc/atheros_hal/dist/ar5416: ar5416_attach.c Log Message: PR/51540: Henning Petersen: replace , with ; To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_attach.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_attach.c diff -u src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_attach.c:1.4 src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_attach.c:1.5 --- src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_attach.c:1.4 Mon Mar 7 06:25:44 2011 +++ src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_attach.c Sun Oct 9 10:40:47 2016 @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5416_attach.c,v 1.4 2011/03/07 11:25:44 cegger Exp $ + * $Id: ar5416_attach.c,v 1.5 2016/10/09 14:40:47 christos Exp $ */ #include "opt_ah.h" @@ -86,8 +86,8 @@ ar5416InitState(struct ath_hal_5416 *ahp ah->ah_disable = ar5416Disable; ah->ah_configPCIE = ar5416ConfigPCIE; ah->ah_perCalibration = ar5416PerCalibration; - ah->ah_perCalibrationN = ar5416PerCalibrationN, - ah->ah_resetCalValid = ar5416ResetCalValid, + ah->ah_perCalibrationN = ar5416PerCalibrationN; + ah->ah_resetCalValid = ar5416ResetCalValid; ah->ah_setTxPowerLimit = ar5416SetTxPowerLimit; ah->ah_setTxPower = ar5416SetTransmitPower; ah->ah_setBoardValues = ar5416SetBoardValues; @@ -104,8 +104,8 @@ ar5416InitState(struct ath_hal_5416 *ahp ah->ah_stopPcuReceive = ar5416StopPcuReceive; ah->ah_setupRxDesc = ar5416SetupRxDesc; ah->ah_procRxDesc = ar5416ProcRxDesc; - ah->ah_rxMonitor = ar5416AniPoll, - ah->ah_procMibEvent = ar5416ProcessMibIntr, + ah->ah_rxMonitor = ar5416AniPoll; + ah->ah_procMibEvent = ar5416ProcessMibIntr; /* Misc Functions */ ah->ah_getDiagState = ar5416GetDiagState;
CVS commit: src/sys/external/bsd/acpica/dist/disassembler
Module Name:src Committed By: christos Date: Sun Oct 9 14:35:33 UTC 2016 Modified Files: src/sys/external/bsd/acpica/dist/disassembler: dmresrcl2.c Log Message: PR/51540: Henning Petersen: replace , with ; To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c diff -u src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c:1.5 src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c:1.6 --- src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c:1.5 Wed May 4 15:27:57 2016 +++ src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c Sun Oct 9 10:35:33 2016 @@ -518,7 +518,7 @@ AcpiDmI2cSerialBusDescriptor ( ResourceSourceOffset = sizeof (AML_RESOURCE_COMMON_SERIALBUS) + Resource->CommonSerialBus.TypeDataLength; -DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset), +DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset); AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX); /* ResourceSourceIndex, ResourceUsage */
CVS commit: src/sys/external/bsd/acpica/dist/compiler
Module Name:src Committed By: christos Date: Sun Oct 9 14:06:11 UTC 2016 Modified Files: src/sys/external/bsd/acpica/dist/compiler: aslopt.c Log Message: PR/51540: Henning Petersen: replace , with ; To generate a diff of this commit: cvs rdiff -u -r1.1.1.8 -r1.2 \ src/sys/external/bsd/acpica/dist/compiler/aslopt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/acpica/dist/compiler/aslopt.c diff -u src/sys/external/bsd/acpica/dist/compiler/aslopt.c:1.1.1.8 src/sys/external/bsd/acpica/dist/compiler/aslopt.c:1.2 --- src/sys/external/bsd/acpica/dist/compiler/aslopt.c:1.1.1.8 Wed May 4 14:15:55 2016 +++ src/sys/external/bsd/acpica/dist/compiler/aslopt.c Sun Oct 9 10:06:11 2016 @@ -133,7 +133,7 @@ OptSearchToRoot ( * not match, and we cannot use this optimization. */ Path = &(((char *) TargetPath->Pointer)[ -TargetPath->Length - ACPI_NAME_SIZE]), +TargetPath->Length - ACPI_NAME_SIZE]); ScopeInfo.Scope.Node = CurrentNode; /* Lookup the NameSeg using SEARCH_PARENT (search-to-root) */
CVS commit: src/external/cddl/osnet/dist/uts/common/dtrace
Module Name:src Committed By: christos Date: Sun Oct 9 14:05:12 UTC 2016 Modified Files: src/external/cddl/osnet/dist/uts/common/dtrace: dtrace.c Log Message: PR/51539: Henning Petersen: replace , with ; To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 \ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c diff -u src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.33 src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.34 --- src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c:1.33 Sat Jul 16 22:09:10 2016 +++ src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c Sun Oct 9 10:05:12 2016 @@ -16659,7 +16659,7 @@ dtrace_state_worker_add(void (*fn)(dtrac w = kmem_alloc(sizeof(*w), KM_SLEEP); mutex_init(&w->lock, MUTEX_DEFAULT, IPL_NONE); cv_init(&w->cv, "dtrace"); - w->interval = ((uintmax_t)hz * interval) / NANOSEC, + w->interval = ((uintmax_t)hz * interval) / NANOSEC; w->fn = fn; w->state = state; w->exiting = false;
CVS commit: src/lib/libc/db/btree
Module Name:src Committed By: joerg Date: Sun Oct 9 11:48:24 UTC 2016 Modified Files: src/lib/libc/db/btree: bt_debug.c Log Message: Fix syntax for currently not compiled in code. From Henning Petersen in PR lib/51538. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/lib/libc/db/btree/bt_debug.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/db/btree/bt_debug.c diff -u src/lib/libc/db/btree/bt_debug.c:1.18 src/lib/libc/db/btree/bt_debug.c:1.19 --- src/lib/libc/db/btree/bt_debug.c:1.18 Sat Sep 24 21:31:25 2016 +++ src/lib/libc/db/btree/bt_debug.c Sun Oct 9 11:48:24 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: bt_debug.c,v 1.18 2016/09/24 21:31:25 christos Exp $ */ +/* $NetBSD: bt_debug.c,v 1.19 2016/10/09 11:48:24 joerg Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -37,7 +37,7 @@ #endif #include -__RCSID("$NetBSD: bt_debug.c,v 1.18 2016/09/24 21:31:25 christos Exp $"); +__RCSID("$NetBSD: bt_debug.c,v 1.19 2016/10/09 11:48:24 joerg Exp $"); #include #include @@ -312,7 +312,7 @@ __bt_stat(DB *dbp) pcont = pinternal = pleaf = 0; nkeys = ifree = lfree = 0; for (i = P_ROOT; i < t->bt_mp->npages && - (h = mpool_get(t->bt_mp, i, MPOOL_IGNOREPIN)) != NULL; ++i) + (h = mpool_get(t->bt_mp, i, MPOOL_IGNOREPIN)) != NULL; ++i) { switch (h->flags & P_TYPE) { case P_BINTERNAL: case P_RINTERNAL:
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sun Oct 9 09:36:09 UTC 2016 Modified Files: src/sys/dev/usb [nick-nhusb]: if_smsc.c Log Message: Misc style/non-functional changes To generate a diff of this commit: cvs rdiff -u -r1.22.2.14 -r1.22.2.15 src/sys/dev/usb/if_smsc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/if_smsc.c diff -u src/sys/dev/usb/if_smsc.c:1.22.2.14 src/sys/dev/usb/if_smsc.c:1.22.2.15 --- src/sys/dev/usb/if_smsc.c:1.22.2.14 Sun Oct 2 10:39:29 2016 +++ src/sys/dev/usb/if_smsc.c Sun Oct 9 09:36:09 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: if_smsc.c,v 1.22.2.14 2016/10/02 10:39:29 skrll Exp $ */ +/* $NetBSD: if_smsc.c,v 1.22.2.15 2016/10/09 09:36:09 skrll Exp $ */ /* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */ /* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */ @@ -1455,19 +1455,14 @@ done: void smsc_txeof(struct usbd_xfer *xfer, void *priv, usbd_status status) { - struct smsc_softc *sc; - struct smsc_chain *c; - struct ifnet *ifp; - int s; - - c = priv; - sc = c->sc_sc; - ifp = &sc->sc_ec.ec_if; + struct smsc_chain *c = priv; + struct smsc_softc *sc = c->sc_sc; + struct ifnet *ifp = &sc->sc_ec.ec_if; if (sc->sc_dying) return; - s = splnet(); + int s = splnet(); ifp->if_timer = 0; ifp->if_flags &= ~IFF_OACTIVE; @@ -1499,11 +1494,10 @@ smsc_txeof(struct usbd_xfer *xfer, void int smsc_tx_list_init(struct smsc_softc *sc) { - struct smsc_cdata *cd; + struct smsc_cdata *cd = &sc->sc_cdata; struct smsc_chain *c; int i; - cd = &sc->sc_cdata; for (i = 0; i < SMSC_TX_LIST_CNT; i++) { c = &cd->tx_chain[i]; c->sc_sc = sc; @@ -1541,11 +1535,10 @@ smsc_tx_list_free(struct smsc_softc *sc) int smsc_rx_list_init(struct smsc_softc *sc) { - struct smsc_cdata *cd; + struct smsc_cdata *cd = &sc->sc_cdata; struct smsc_chain *c; int i; - cd = &sc->sc_cdata; for (i = 0; i < SMSC_RX_LIST_CNT; i++) { c = &cd->rx_chain[i]; c->sc_sc = sc;
CVS commit: src/doc
Module Name:src Committed By: roy Date: Sun Oct 9 09:25:26 UTC 2016 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-6.11.4 To generate a diff of this commit: cvs rdiff -u -r1.1365 -r1.1366 src/doc/3RDPARTY cvs rdiff -u -r1.2195 -r1.2196 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1365 src/doc/3RDPARTY:1.1366 --- src/doc/3RDPARTY:1.1365 Fri Oct 7 15:31:01 2016 +++ src/doc/3RDPARTY Sun Oct 9 09:25:26 2016 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1365 2016/10/07 15:31:01 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1366 2016/10/09 09:25:26 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -320,8 +320,8 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 6.11.3 -Current Vers: 6.11.3 +Version: 6.11.4 +Current Vers: 6.11.5 (not needed for NetBSD) Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2195 src/doc/CHANGES:1.2196 --- src/doc/CHANGES:1.2195 Fri Oct 7 15:31:01 2016 +++ src/doc/CHANGES Sun Oct 9 09:25:26 2016 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2195 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2196 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -380,3 +380,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: bind: Import version 9.10.4-P3. [christos 20161004] mips: Add support for MediaTek MT7628 SoC [ryo 20161006] libc: Update to tzcode2016g. [christos 20161007] + dhcpcd(8): Import dhcpcd-6.11.4 [roy 20161009]
CVS commit: src/external/bsd/dhcpcd/sbin/dhcpcd
Module Name:src Committed By: roy Date: Sun Oct 9 09:23:59 UTC 2016 Modified Files: src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile Log Message: If SMALLPROG is defined, use a minimal dhcpcd-definitons.conf and compile out IPv4LL and DHCP authentication. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.32 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.33 --- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.32 Sun Sep 18 15:37:23 2016 +++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Sun Oct 9 09:23:59 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2016/09/18 15:37:23 christos Exp $ +# $NetBSD: Makefile,v 1.33 2016/10/09 09:23:59 roy Exp $ # WARNS?= 6 @@ -14,25 +14,37 @@ SRCS+= if-bsd.c CPPFLAGS+= -DHAVE_CONFIG_H -D_OPENBSD_SOURCE +USE_INET?= yes + .if defined(SMALLPROG) -CPPFLAGS+= -DNO_AUTH +CPPFLAGS+= -DSMALL +DHCPCD_DEFS= dhcpcd-definitions-small.conf .else +DHCPCD_DEFS= dhcpcd-definitions.conf +CPPFLAGS+= -DAUTH SRCS+= auth.c hmac_md5.c .endif -USE_INET?= yes .if (${USE_INET} != "no") CPPFLAGS+= -DINET -SRCS+= arp.c dhcp.c ipv4.c ipv4ll.c +SRCS+= arp.c dhcp.c ipv4.c +.if !defined(SMALLPROG) +CPPFLAGS+= -DIPV4LL +SRCS+= ipv4ll.c +.endif .endif .if (${USE_INET6} != "no") CPPFLAGS+= -DINET6 -SRCS+= ipv6.c ipv6nd.c dhcp6.c +SRCS+= ipv6.c ipv6nd.c +# -DSMALL already strips out prefix delegation +# A network could be IPv6 only and require DHCPv6 +CPPFLAGS+= -DDHCP6 +SRCS+= dhcp6.c .endif DIST= ${NETBSDSRCDIR}/external/bsd/dhcpcd/dist -CPPFLAGS+= -I${DIST} +CPPFLAGS+= -I${DIST} -I${.OBJDIR} DPADD+= ${LIBUTIL} LDADD+= -lutil @@ -66,6 +78,16 @@ MAN= dhcpcd.conf.5 dhcpcd.8 dhcpcd-run CLEANFILES= dhcpcd.conf.5 dhcpcd.8 \ dhcpcd-run-hooks dhcpcd-run-hooks.8 +dhcpcd-embedded.h: genembedh ${DHCPCD_DEFS} dhcpcd-embedded.h.in + ${HOST_SH} ${.ALLSRC} $^ > $@ + +dhcpcd-embedded.c: genembedc ${DHCPCD_DEFS} dhcpcd-embedded.c.in + ${HOST_SH} ${.ALLSRC} $^ > $@ + +if-options.c: dhcpcd-embedded.h + +CLEANFILES+= dhcpcd-embedded.c dhcpcd-embedded.h + .for f in dhcpcd-run-hooks dhcpcd.conf.5 dhcpcd.8 dhcpcd-run-hooks.8 ${f}: ${f}.in ${TOOL_SED} -e 's:@SYSCONFDIR@:/etc:g' -e 's:@DBDIR@:/var/db:g' \
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Sun Oct 9 09:18:26 UTC 2016 Modified Files: src/external/bsd/dhcpcd/dist: arp.c auth.h common.c common.h config.h defs.h dhcp.c dhcp6.c dhcp6.h dhcpcd.c dhcpcd.h if-bsd.c if-options.c if.c if.h ipv4.c ipv4.h ipv4ll.c ipv4ll.h ipv6.c ipv6.h ipv6nd.c script.c Removed Files: src/external/bsd/dhcpcd/dist: dhcpcd-embedded.c dhcpcd-embedded.h Log Message: Sync To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/external/bsd/dhcpcd/dist/arp.c \ src/external/bsd/dhcpcd/dist/ipv6.c cvs rdiff -u -r1.9 -r1.10 src/external/bsd/dhcpcd/dist/auth.h cvs rdiff -u -r1.20 -r1.21 src/external/bsd/dhcpcd/dist/common.c \ src/external/bsd/dhcpcd/dist/ipv6.h cvs rdiff -u -r1.14 -r1.15 src/external/bsd/dhcpcd/dist/common.h cvs rdiff -u -r1.11 -r1.12 src/external/bsd/dhcpcd/dist/config.h cvs rdiff -u -r1.30 -r1.31 src/external/bsd/dhcpcd/dist/defs.h cvs rdiff -u -r1.46 -r1.47 src/external/bsd/dhcpcd/dist/dhcp.c cvs rdiff -u -r1.25 -r1.26 src/external/bsd/dhcpcd/dist/dhcp6.c \ src/external/bsd/dhcpcd/dist/ipv4.c cvs rdiff -u -r1.15 -r1.16 src/external/bsd/dhcpcd/dist/dhcp6.h cvs rdiff -u -r1.13 -r0 src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c cvs rdiff -u -r1.10 -r0 src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h cvs rdiff -u -r1.36 -r1.37 src/external/bsd/dhcpcd/dist/dhcpcd.c cvs rdiff -u -r1.19 -r1.20 src/external/bsd/dhcpcd/dist/dhcpcd.h \ src/external/bsd/dhcpcd/dist/ipv4.h cvs rdiff -u -r1.33 -r1.34 src/external/bsd/dhcpcd/dist/if-bsd.c cvs rdiff -u -r1.35 -r1.36 src/external/bsd/dhcpcd/dist/if-options.c cvs rdiff -u -r1.23 -r1.24 src/external/bsd/dhcpcd/dist/if.c cvs rdiff -u -r1.18 -r1.19 src/external/bsd/dhcpcd/dist/if.h \ src/external/bsd/dhcpcd/dist/ipv4ll.c cvs rdiff -u -r1.12 -r1.13 src/external/bsd/dhcpcd/dist/ipv4ll.h cvs rdiff -u -r1.32 -r1.33 src/external/bsd/dhcpcd/dist/ipv6nd.c cvs rdiff -u -r1.27 -r1.28 src/external/bsd/dhcpcd/dist/script.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/dhcpcd/dist/arp.c diff -u src/external/bsd/dhcpcd/dist/arp.c:1.21 src/external/bsd/dhcpcd/dist/arp.c:1.22 --- src/external/bsd/dhcpcd/dist/arp.c:1.21 Fri Jul 29 10:07:57 2016 +++ src/external/bsd/dhcpcd/dist/arp.c Sun Oct 9 09:18:26 2016 @@ -1,5 +1,5 @@ #include - __RCSID("$NetBSD: arp.c,v 1.21 2016/07/29 10:07:57 roy Exp $"); + __RCSID("$NetBSD: arp.c,v 1.22 2016/10/09 09:18:26 roy Exp $"); /* * dhcpcd - DHCP client daemon @@ -448,6 +448,8 @@ arp_handleifa(int cmd, struct ipv4_addr struct iarp_state *state; struct arp_state *astate, *asn; + /* If the address is deleted, the ARP state should be freed by the + * state owner, such as DHCP or IPv4LL. */ if (cmd != RTM_NEWADDR || (state = ARP_STATE(addr->iface)) == NULL) return; Index: src/external/bsd/dhcpcd/dist/ipv6.c diff -u src/external/bsd/dhcpcd/dist/ipv6.c:1.21 src/external/bsd/dhcpcd/dist/ipv6.c:1.22 --- src/external/bsd/dhcpcd/dist/ipv6.c:1.21 Mon Aug 15 11:04:53 2016 +++ src/external/bsd/dhcpcd/dist/ipv6.c Sun Oct 9 09:18:26 2016 @@ -1,5 +1,5 @@ #include - __RCSID("$NetBSD: ipv6.c,v 1.21 2016/08/15 11:04:53 roy Exp $"); + __RCSID("$NetBSD: ipv6.c,v 1.22 2016/10/09 09:18:26 roy Exp $"); /* * dhcpcd - DHCP client daemon @@ -104,20 +104,22 @@ #if defined(HAVE_IN6_ADDR_GEN_MODE_NONE) || defined(ND6_IFF_AUTO_LINKLOCAL) || \ defined(IFF_NOLINKLOCAL) -/* If we're using a private SLAAC address on wireless, - * don't add it until we have associated as we randomise - * it based on the SSID. */ -#define CAN_ADD_LLADDR(ifp) \ - (!((ifp)->options->options & DHCPCD_SLAACPRIVATE) || \ - (ifp)->carrier != LINK_DOWN) -#elif __NetBSD__ -/* Earlier versions of NetBSD don't add duplicate LLADDR's if the interface - * is brought up and one already exists. */ -#define CAN_ADD_LLADDR(ifp) (1) +/* Only add the LL address if we have a carrier, so DaD works. */ +#define CAN_ADD_LLADDR(ifp) \ +(!((ifp)->options->options & DHCPCD_LINK) || (ifp)->carrier != LINK_DOWN) +#ifdef __sun +/* Although we can add our own LL address, we cannot drop it + * without unplumbing the if which is a lot of code. + * So just keep it for the time being. */ +#define CAN_DROP_LLADDR(ifp) (0) +#else +#define CAN_DROP_LLADDR(ifp) (1) +#endif #else /* We have no control over the OS adding the LLADDR, so just let it do it * as we cannot force our own view on it. */ -#define CAN_ADD_LLADDR(ifp) (0) +#define CAN_ADD_LLADDR(ifp) (0) +#define CAN_DROP_LLADDR(ifp) (0) #endif #ifdef IPV6_MANAGETEMPADDR @@ -163,13 +165,11 @@ ipv6_init(struct dhcpcd_ctx *dhcpcd_ctx) ctx->sndhdr.msg_controllen = sizeof(ctx->sndbuf); ctx->rcvhdr.msg_name = &ctx->from; ctx->rcvhdr.msg_namelen = sizeof(ctx->from); - ctx->rcvhdr.msg_iov = ctx->rcviov; + ctx->rcvhdr.msg_iov = dhcpcd_ctx->iov; ctx->rcvhdr.msg_iovlen = 1; - ctx->rcvhdr.msg_control