Module Name: src Committed By: msaitoh Date: Tue Feb 18 03:48:23 UTC 2020
Modified Files: src/sys/dev/pci: if_re_pci.c if_wm.c Log Message: Whitespace fix. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/dev/pci/if_re_pci.c cvs rdiff -u -r1.666 -r1.667 src/sys/dev/pci/if_wm.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/pci/if_re_pci.c diff -u src/sys/dev/pci/if_re_pci.c:1.51 src/sys/dev/pci/if_re_pci.c:1.52 --- src/sys/dev/pci/if_re_pci.c:1.51 Thu Jan 30 00:36:29 2020 +++ src/sys/dev/pci/if_re_pci.c Tue Feb 18 03:48:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_re_pci.c,v 1.51 2020/01/30 00:36:29 jmcneill Exp $ */ +/* $NetBSD: if_re_pci.c,v 1.52 2020/02/18 03:48:22 msaitoh Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_re_pci.c,v 1.51 2020/01/30 00:36:29 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_re_pci.c,v 1.52 2020/02/18 03:48:22 msaitoh Exp $"); #include <sys/types.h> @@ -130,7 +130,7 @@ re_pci_lookup(const struct pci_attach_ar { int i; - for(i = 0; i < __arraycount(re_devs); i++) { + for (i = 0; i < __arraycount(re_devs); i++) { if (PCI_VENDOR(pa->pa_id) != re_devs[i].rtk_vid) continue; if (PCI_PRODUCT(pa->pa_id) == re_devs[i].rtk_did) @@ -210,7 +210,7 @@ re_pci_attach(device_t parent, device_t case PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_64BIT: memh_valid = (pci_mapreg_map(pa, RTK_PCI_LOMEM, - memtype, 0, &memt, &memh, NULL, &memsize) == 0) || + memtype, 0, &memt, &memh, NULL, &memsize) == 0) || (pci_mapreg_map(pa, RTK_PCI_LOMEM + 4, PCI_MAPREG_TYPE_MEM | PCI_MAPREG_MEM_TYPE_64BIT, 0, &memt, &memh, NULL, &memsize) == 0); Index: src/sys/dev/pci/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.666 src/sys/dev/pci/if_wm.c:1.667 --- src/sys/dev/pci/if_wm.c:1.666 Fri Jan 31 12:09:13 2020 +++ src/sys/dev/pci/if_wm.c Tue Feb 18 03:48:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.666 2020/01/31 12:09:13 knakahara Exp $ */ +/* $NetBSD: if_wm.c,v 1.667 2020/02/18 03:48:22 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -82,7 +82,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.666 2020/01/31 12:09:13 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.667 2020/02/18 03:48:22 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -8666,7 +8666,7 @@ wm_txeof(struct wm_txqueue *txq, u_int l log(LOG_WARNING, "%s: late collision\n", device_xname(sc->sc_dev)); else if (status & WTX_ST_EC) { - if_statadd(ifp, if_collisions, + if_statadd(ifp, if_collisions, TX_COLLISION_THRESHOLD + 1); log(LOG_WARNING, "%s: excessive collisions\n", device_xname(sc->sc_dev));