Thu Jan 30 06:25:46 2020 UTC ()
Fix typo


(martin)
diff -r1.53 -r1.54 src/sys/arch/sgimips/hpc/if_sq.c
cvs diff -r1.53 -r1.54 src/sys/arch/sgimips/hpc/if_sq.c (expand / switch to unified diff)

--- src/sys/arch/sgimips/hpc/if_sq.c 2020/01/29 05:37:08 1.53
+++ src/sys/arch/sgimips/hpc/if_sq.c 2020/01/30 06:25:46 1.54
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: if_sq.c,v 1.53 2020/01/29 05:37:08 thorpej Exp $ */ 1/* $NetBSD: if_sq.c,v 1.54 2020/01/30 06:25:46 martin Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001 Rafal K. Boni 4 * Copyright (c) 2001 Rafal K. Boni
5 * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. 5 * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Portions of this code are derived from software contributed to The 8 * Portions of this code are derived from software contributed to The
9 * NetBSD Foundation by Jason R. Thorpe of the Numerical Aerospace 9 * NetBSD Foundation by Jason R. Thorpe of the Numerical Aerospace
10 * Simulation Facility, NASA Ames Research Center. 10 * Simulation Facility, NASA Ames Research Center.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions 13 * modification, are permitted provided that the following conditions
14 * are met: 14 * are met:
@@ -23,27 +23,27 @@ @@ -23,27 +23,27 @@
23 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 23 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
24 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 24 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
25 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 25 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
26 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 26 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
27 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 27 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
28 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 28 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 29 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */ 33 */
34 34
35#include <sys/cdefs.h> 35#include <sys/cdefs.h>
36__KERNEL_RCSID(0, "$NetBSD: if_sq.c,v 1.53 2020/01/29 05:37:08 thorpej Exp $"); 36__KERNEL_RCSID(0, "$NetBSD: if_sq.c,v 1.54 2020/01/30 06:25:46 martin Exp $");
37 37
38 38
39#include <sys/param.h> 39#include <sys/param.h>
40#include <sys/systm.h> 40#include <sys/systm.h>
41#include <sys/device.h> 41#include <sys/device.h>
42#include <sys/callout.h> 42#include <sys/callout.h>
43#include <sys/mbuf.h> 43#include <sys/mbuf.h>
44#include <sys/malloc.h> 44#include <sys/malloc.h>
45#include <sys/kernel.h> 45#include <sys/kernel.h>
46#include <sys/socket.h> 46#include <sys/socket.h>
47#include <sys/ioctl.h> 47#include <sys/ioctl.h>
48#include <sys/errno.h> 48#include <sys/errno.h>
49#include <sys/syslog.h> 49#include <sys/syslog.h>
@@ -1064,27 +1064,27 @@ static int @@ -1064,27 +1064,27 @@ static int
1064sq_txintr(struct sq_softc *sc) 1064sq_txintr(struct sq_softc *sc)
1065{ 1065{
1066 int shift = 0; 1066 int shift = 0;
1067 uint32_t status, tmp; 1067 uint32_t status, tmp;
1068 struct ifnet *ifp = &sc->sc_ethercom.ec_if; 1068 struct ifnet *ifp = &sc->sc_ethercom.ec_if;
1069 1069
1070 if (sc->hpc_regs->revision != 3) 1070 if (sc->hpc_regs->revision != 3)
1071 shift = 16; 1071 shift = 16;
1072 1072
1073 status = sq_hpc_read(sc, sc->hpc_regs->enetx_ctl) >> shift; 1073 status = sq_hpc_read(sc, sc->hpc_regs->enetx_ctl) >> shift;
1074 1074
1075 SQ_TRACE(SQ_TXINTR_ENTER, sc, sc->sc_prevtx, status); 1075 SQ_TRACE(SQ_TXINTR_ENTER, sc, sc->sc_prevtx, status);
1076 1076
1077 net_stats_ref_t nsr = IF_STAT_GETREF(ifp); 1077 net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
1078 tmp = (sc->hpc_regs->enetx_ctl_active >> shift) | TXSTAT_GOOD; 1078 tmp = (sc->hpc_regs->enetx_ctl_active >> shift) | TXSTAT_GOOD;
1079 if ((status & tmp) == 0) { 1079 if ((status & tmp) == 0) {
1080 if (status & TXSTAT_COLL) 1080 if (status & TXSTAT_COLL)
1081 if_statinc_ref(nsr, if_collisions); 1081 if_statinc_ref(nsr, if_collisions);
1082 1082
1083 if (status & TXSTAT_UFLOW) { 1083 if (status & TXSTAT_UFLOW) {
1084 printf("%s: transmit underflow\n", 1084 printf("%s: transmit underflow\n",
1085 device_xname(sc->sc_dev)); 1085 device_xname(sc->sc_dev));
1086 if_statinc_ref(nsr, if_oerrors); 1086 if_statinc_ref(nsr, if_oerrors);
1087 } 1087 }
1088 1088
1089 if (status & TXSTAT_16COLL) { 1089 if (status & TXSTAT_16COLL) {
1090 printf("%s: max collisions reached\n", 1090 printf("%s: max collisions reached\n",