Module Name: src Committed By: skrll Date: Thu Sep 29 06:59:02 UTC 2022
Modified Files: src/sys/arch/mips/cavium/dev: if_cnmac.c octeon_smi.c octeon_xhci.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/mips/cavium/dev/if_cnmac.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/cavium/dev/octeon_smi.c \ src/sys/arch/mips/cavium/dev/octeon_xhci.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/mips/cavium/dev/if_cnmac.c diff -u src/sys/arch/mips/cavium/dev/if_cnmac.c:1.27 src/sys/arch/mips/cavium/dev/if_cnmac.c:1.28 --- src/sys/arch/mips/cavium/dev/if_cnmac.c:1.27 Sun Sep 18 11:38:48 2022 +++ src/sys/arch/mips/cavium/dev/if_cnmac.c Thu Sep 29 06:59:01 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: if_cnmac.c,v 1.27 2022/09/18 11:38:48 thorpej Exp $ */ +/* $NetBSD: if_cnmac.c,v 1.28 2022/09/29 06:59:01 skrll Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cnmac.c,v 1.27 2022/09/18 11:38:48 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cnmac.c,v 1.28 2022/09/29 06:59:01 skrll Exp $"); /* * If no free send buffer is available, free all the sent buffers and bail out. @@ -318,7 +318,7 @@ cnmac_attach(device_t parent, device_t s IFQ_SET_MAXLEN(&ifp->if_snd, uimax(GATHER_QUEUE_SIZE, IFQ_MAXLEN)); IFQ_SET_READY(&ifp->if_snd); - + ifp->if_capabilities = #if 0 /* XXX: no tx checksum yet */ IFCAP_CSUM_IPv4_Tx | IFCAP_CSUM_IPv4_Rx | Index: src/sys/arch/mips/cavium/dev/octeon_smi.c diff -u src/sys/arch/mips/cavium/dev/octeon_smi.c:1.7 src/sys/arch/mips/cavium/dev/octeon_smi.c:1.8 --- src/sys/arch/mips/cavium/dev/octeon_smi.c:1.7 Wed Jan 27 03:10:21 2021 +++ src/sys/arch/mips/cavium/dev/octeon_smi.c Thu Sep 29 06:59:01 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: octeon_smi.c,v 1.7 2021/01/27 03:10:21 thorpej Exp $ */ +/* $NetBSD: octeon_smi.c,v 1.8 2022/09/29 06:59:01 skrll Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: octeon_smi.c,v 1.7 2021/01/27 03:10:21 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: octeon_smi.c,v 1.8 2022/09/29 06:59:01 skrll Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -198,7 +198,7 @@ octsmi_read(struct octsmi_softc *sc, int uint64_t smi_rd; int timo; - _SMI_WR8(sc, SMI_CMD_OFFSET, + _SMI_WR8(sc, SMI_CMD_OFFSET, __SHIFTIN(SMI_CMD_PHY_OP_READ, SMI_CMD_PHY_OP) | __SHIFTIN(phy_addr, SMI_CMD_PHY_ADR) | __SHIFTIN(reg, SMI_CMD_REG_ADR)); Index: src/sys/arch/mips/cavium/dev/octeon_xhci.c diff -u src/sys/arch/mips/cavium/dev/octeon_xhci.c:1.7 src/sys/arch/mips/cavium/dev/octeon_xhci.c:1.8 --- src/sys/arch/mips/cavium/dev/octeon_xhci.c:1.7 Wed Nov 10 17:19:29 2021 +++ src/sys/arch/mips/cavium/dev/octeon_xhci.c Thu Sep 29 06:59:01 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: octeon_xhci.c,v 1.7 2021/11/10 17:19:29 msaitoh Exp $ */ +/* $NetBSD: octeon_xhci.c,v 1.8 2022/09/29 06:59:01 skrll Exp $ */ /* $OpenBSD: octxhci.c,v 1.4 2019/09/29 04:32:23 visa Exp $ */ /* @@ -380,7 +380,7 @@ octxhci_dwc3_init(struct xhci_softc *sc) } /* ---- bus_space(9) */ -#define CHIP octxhci +#define CHIP octxhci #define CHIP_IO #define CHIP_LITTLE_ENDIAN