CVS commit: src/sys/dev/pci

2019-07-04 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Fri Jul  5 06:19:49 UTC 2019

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
 Regen.


To generate a diff of this commit:
cvs rdiff -u -r1.1364 -r1.1365 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1363 -r1.1364 src/sys/dev/pci/pcidevs_data.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/pci

2019-07-04 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Fri Jul  5 06:19:24 UTC 2019

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
 Add some Intel Whisky Lake devices.


To generate a diff of this commit:
cvs rdiff -u -r1.1376 -r1.1377 src/sys/dev/pci/pcidevs

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/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1376 src/sys/dev/pci/pcidevs:1.1377
--- src/sys/dev/pci/pcidevs:1.1376	Tue Jul  2 07:52:58 2019
+++ src/sys/dev/pci/pcidevs	Fri Jul  5 06:19:24 2019
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1376 2019/07/02 07:52:58 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1377 2019/07/05 06:19:24 msaitoh Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -4801,8 +4801,11 @@ product INTEL COFLK_IGD_3	0x3e92	UHD Gra
 product INTEL COFLK_IGD_4	0x3e93	UHD Graphics 610
 product INTEL XEONE_IGD		0x3e96	UHD Graphics P630
 product INTEL COFLK_IGD_5	0x3e9b	UHD Graphics 630
+product INTEL WHISKYLK_IGD_1	0x3ea0	UHD Graphics 620
+product INTEL WHISKYLK_IGD_2	0x3ea1	UHD Graphics 610
 product INTEL COFLK_IGD_6	0x3ea5	Iris Plus Graphics 655
 product INTEL XEONE_S_D_HOST_DRAM_6C 0x3ec2 Xeon E (S, Desktop) Host Bridge, DRAM
+product INTEL CORE8G_H_H_HOST_DRAM_6C 0x3ec4 Core 8G (H, Halo) Host Bridge, DRAM
 product INTEL XEONE_S_W_HOST_DRAM_6C 0x3ec6 Xeon E (S, WS) Host Bridge, DRAM
 product INTEL XEONE_S_S_HOST_DRAM_6C 0x3eca Xeon E (S, Server) Host Bridge, DRAM
 product INTEL XEONE_U_HOST_DRAM_2C 0x3ecc Xeon E (U) Host Bridge, DRAM



CVS commit: src/sys/dev/pci

2019-07-04 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Fri Jul  5 06:19:24 UTC 2019

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
 Add some Intel Whisky Lake devices.


To generate a diff of this commit:
cvs rdiff -u -r1.1376 -r1.1377 src/sys/dev/pci/pcidevs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/pckbport

2019-07-04 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Fri Jul  5 05:09:24 UTC 2019

Modified Files:
src/sys/dev/pckbport: synaptics.c

Log Message:
Resynchronizing the input stream could infinitely wait when the touchpad
is in the wrong (relative) mode. The detection of relative mode is never
reached.

Limit the resynchronization to 6 bytes, then trigger a reset.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pckbport/synaptics.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/pckbport/synaptics.c
diff -u src/sys/dev/pckbport/synaptics.c:1.49 src/sys/dev/pckbport/synaptics.c:1.50
--- src/sys/dev/pckbport/synaptics.c:1.49	Sun Jun  2 08:55:00 2019
+++ src/sys/dev/pckbport/synaptics.c	Fri Jul  5 05:09:24 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: synaptics.c,v 1.49 2019/06/02 08:55:00 blymn Exp $	*/
+/*	$NetBSD: synaptics.c,v 1.50 2019/07/05 05:09:24 mlelstv Exp $	*/
 
 /*
  * Copyright (c) 2005, Steve C. Woodford
@@ -48,7 +48,7 @@
 #include "opt_pms.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.49 2019/06/02 08:55:00 blymn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.50 2019/07/05 05:09:24 mlelstv Exp $");
 
 #include 
 #include 
@@ -1154,7 +1154,7 @@ pms_synaptics_input(void *vsc, int data)
 
 	getmicrouptime(&psc->current);
 
-	if (psc->inputstate > 0) {
+	if (psc->inputstate != 0) {
 		timersub(&psc->current, &psc->last, &diff);
 		if (diff.tv_sec > 0 || diff.tv_usec >= 4) {
 			aprint_debug_dev(psc->sc_dev,
@@ -1173,14 +1173,23 @@ pms_synaptics_input(void *vsc, int data)
 	psc->last = psc->current;
 
 	switch (psc->inputstate) {
+	case -5:
+	case -4:
+	case -3:
+	case -2:
+	case -1:
 	case 0:
 		if ((data & 0xc8) != 0x80) {
 			aprint_debug_dev(psc->sc_dev,
 			"pms_input: 0x%02x out of sync\n", data);
+			/* use negative counts to limit resync phase */
+			psc->inputstate--;
 			return;	/* not in sync yet, discard input */
 		}
+		psc->inputstate = 0;
 		/*FALLTHROUGH*/
 
+	case -6:
 	case 3:
 		if ((data & 8) == 8) {
 			aprint_debug_dev(psc->sc_dev,



CVS commit: src/sys/dev/pckbport

2019-07-04 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Fri Jul  5 05:09:24 UTC 2019

Modified Files:
src/sys/dev/pckbport: synaptics.c

Log Message:
Resynchronizing the input stream could infinitely wait when the touchpad
is in the wrong (relative) mode. The detection of relative mode is never
reached.

Limit the resynchronization to 6 bytes, then trigger a reset.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pckbport/synaptics.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared

2019-07-04 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Thu Jul  4 15:54:09 UTC 2019

Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_ipc.h

Log Message:
Get the very generically-named put_uint32(), etc. out of the application
namespace.  These symbols are not intended to be used outside of the
dns_sd library.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h:1.7 src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h:1.8
--- src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h:1.7	Wed Jan 17 06:10:28 2018
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h	Thu Jul  4 15:54:09 2019
@@ -188,6 +188,18 @@ typedef packedstruct
 // ptr is the address of the pointer to the start of the field.
 // it is advanced to point to the next field, or the end of the message
 
+// Keep these out of the general namespace -- they're only used internally
+// by the library.
+#define put_uint32		__dnssd_ipc_put_uint32
+#define get_uint32		__dnssd_ipc_get_uint32
+#define put_uint16		__dnssd_ipc_put_uint16
+#define get_uint16		__dnssd_ipc_get_uint16
+#define put_string		__dnssd_ipc_put_string
+#define get_string		__dnssd_ipc_get_string
+#define put_rdata		__dnssd_ipc_put_rdata
+#define get_rdata		__dnssd_ipc_get_rdata
+#define ConvertHeaderBytes	__dnssd_ipc_ConvertHeaderBytes
+
 void put_uint32(const uint32_t l, char **ptr);
 uint32_t get_uint32(const char **ptr, const char *end);
 



CVS commit: src/external/apache2/mDNSResponder/dist/mDNSShared

2019-07-04 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Thu Jul  4 15:54:09 UTC 2019

Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSShared: dnssd_ipc.h

Log Message:
Get the very generically-named put_uint32(), etc. out of the application
namespace.  These symbols are not intended to be used outside of the
dns_sd library.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/share/misc

2019-07-04 Thread Sevan Janiyan
Module Name:src
Committed By:   sevan
Date:   Thu Jul  4 15:31:37 UTC 2019

Modified Files:
src/share/misc: acronyms.comp

Log Message:
ADDDC AEDC IBPI LMCE POR PPR SAF-TE SDDC SSC WHEA


To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.278 src/share/misc/acronyms.comp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.277 src/share/misc/acronyms.comp:1.278
--- src/share/misc/acronyms.comp:1.277	Wed Jul  3 20:26:16 2019
+++ src/share/misc/acronyms.comp	Thu Jul  4 15:31:37 2019
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.277 2019/07/03 20:26:16 sevan Exp $
+$NetBSD: acronyms.comp,v 1.278 2019/07/04 15:31:37 sevan Exp $
 3WHS	three-way handshake
 8VSB	8-state vestigial side band modulation
 AA	anti-aliasing
@@ -23,12 +23,14 @@ ACU	automatic calling unit
 ADB	Apple desktop bus
 ADC	analog [to] digital converter
 ADD	acronym driven development
+ADDDC	adaptive double DRAM device correction
 ADO	active data objects
 ADP	automatic data processing
 ADPCM	adaptive differential pulse code modulation
 ADS	alternate data stream
 ADSL	asymmetric digital subscriber line
 ADT	abstract data type
+AEDC	advanced error detection and correction
 AER	advanced error reporting
 AES	Advanced Encryption Standard
 AFP	Apple Filing Protocol
@@ -673,6 +675,7 @@ IAAS	infrastructure as a service
 IANA	Internet Assigned Numbers Authority
 IBC	iterated block cipher
 IBM	International Business Machines
+IBPI	international blinking pattern interpretation
 IBS	instruction based sampling
 IBSS	independent basic service set
 IC	integrated circuit
@@ -837,6 +840,7 @@ LLF	low level format
 LLMNR	link-local multicast name resolution
 LLVM	Low Level Virtual Machine
 LM	long mode
+LMCE	local machine check exception
 LMI	local management interface
 LMM	link management mode
 LMP	link management protocol
@@ -1188,6 +1192,7 @@ POE	power over ethernet
 POF	probability of failure
 POP	Post Office Protocol
 POP	power on password
+POR	plan of record
 POSIX	Portable Operating System Interface [for Unix]
 POST	power on self test
 POTS	plain old telephone system
@@ -1202,6 +1207,7 @@ PPM	pages per minute
 PPP	Point-to-Point Protocol
 PPPOA	Point-to-Point Protocol over ATM
 PPPOE	Point-to-Point Protocol over Ethernet
+PPR	processor programming reference
 PPU	physics processing unit
 PRAM	Parameter RAM
 PRBS	pseudorandom bit sequence
@@ -1342,6 +1348,7 @@ SAAS	software as a service
 SABRE	Semi-automated business research environment
 SACD	super audio compact disc
 SAD	security association database
+SAF-TE	SCSI accessed fault-tolerant enclosure
 SAGE	Semi-automated ground environment
 SAL	{service,system} abstraction layer
 SAM	serial access memory
@@ -1376,6 +1383,7 @@ SCP	system control processor
 SCPI	system control and power interface
 SCSI	Small Computer System Interface
 SCTP	Stream Control Transmission Protocol
+SDDC	software defined data center
 SDEI	software delegated exception interface
 SDI	symbol deinterleave
 SDK	software development kit
@@ -1483,6 +1491,7 @@ SS	stack segment
 SSA	static single assignment
 SSAP	source service access point
 SSB	single-sideband modulation
+SSC	spread spectrum clock
 SSD	solid state drive
 SSE	streaming SIMD extensions
 SSFDC	solid state floppy disc card
@@ -1701,6 +1710,7 @@ WEP	Wired Equivalent Privacy
 WFI	wait for interrupt
 WFQ	weighted fair queuing
 WH	write hit
+WHEA	Windows hardware error architecture
 WIFI	wireless fidelity
 WLAN	wireless local area network
 WM	write miss



CVS commit: src/share/misc

2019-07-04 Thread Sevan Janiyan
Module Name:src
Committed By:   sevan
Date:   Thu Jul  4 15:31:37 UTC 2019

Modified Files:
src/share/misc: acronyms.comp

Log Message:
ADDDC AEDC IBPI LMCE POR PPR SAF-TE SDDC SSC WHEA


To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.278 src/share/misc/acronyms.comp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/ifconfig

2019-07-04 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Thu Jul  4 13:55:31 UTC 2019

Modified Files:
src/sbin/ifconfig: ifconfig.8

Log Message:
Formatting nit.


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sbin/ifconfig/ifconfig.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sbin/ifconfig

2019-07-04 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Thu Jul  4 13:55:31 UTC 2019

Modified Files:
src/sbin/ifconfig: ifconfig.8

Log Message:
Formatting nit.


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sbin/ifconfig/ifconfig.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sbin/ifconfig/ifconfig.8
diff -u src/sbin/ifconfig/ifconfig.8:1.117 src/sbin/ifconfig/ifconfig.8:1.118
--- src/sbin/ifconfig/ifconfig.8:1.117	Thu Jul  4 02:45:45 2019
+++ src/sbin/ifconfig/ifconfig.8	Thu Jul  4 13:55:31 2019
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ifconfig.8,v 1.117 2019/07/04 02:45:45 ozaki-r Exp $
+.\"	$NetBSD: ifconfig.8,v 1.118 2019/07/04 13:55:31 wiz Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -390,7 +390,7 @@ key.
 .Pq IEEE 802.11 devices only
 Enable WEP encryption for IEEE 802.11-based wireless network interfaces
 with the persistent key written in the network card.
-.It Cm nwkey Cm persist: Ns Ar key
+.It Cm nwkey Cm persist : Ns Ar key
 .Pq IEEE 802.11 devices only
 Write the
 .Ar key



CVS commit: src/sys/dev/spi

2019-07-04 Thread Kenichi Hashimoto
Module Name:src
Committed By:   hkenken
Date:   Thu Jul  4 11:13:26 UTC 2019

Modified Files:
src/sys/dev/spi: oj6sh.c

Log Message:
Avoid workqueue_check_duplication().


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/spi/oj6sh.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/spi/oj6sh.c
diff -u src/sys/dev/spi/oj6sh.c:1.2 src/sys/dev/spi/oj6sh.c:1.3
--- src/sys/dev/spi/oj6sh.c:1.2	Mon Dec 14 10:31:38 2015
+++ src/sys/dev/spi/oj6sh.c	Thu Jul  4 11:13:26 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: oj6sh.c,v 1.2 2015/12/14 10:31:38 hkenken Exp $	*/
+/*	$NetBSD: oj6sh.c,v 1.3 2019/07/04 11:13:26 hkenken Exp $	*/
 
 /*
  * Copyright (c) 2014  Genetec Corporation.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: oj6sh.c,v 1.2 2015/12/14 10:31:38 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oj6sh.c,v 1.3 2019/07/04 11:13:26 hkenken Exp $");
 
 #include "opt_oj6sh.h"
 
@@ -205,13 +205,7 @@ static void
 oj6sh_poll(void *arg)
 {
 	struct oj6sh_softc *sc = (struct oj6sh_softc *)arg;
-
 	workqueue_enqueue(sc->sc_wq, &sc->sc_wk, NULL);
-
-	if (sc->sc_enabled)
-		callout_reset(&sc->sc_c, POLLRATE, oj6sh_poll, sc);
-
-	return;
 }
 
 static void
@@ -254,6 +248,9 @@ oj6sh_cb(struct work *wk, void *arg)
 	splx(s);
 out:
 	mutex_exit(&sc->sc_lock);
+
+	if (sc->sc_enabled)
+		callout_reset(&sc->sc_c, POLLRATE, oj6sh_poll, sc);
 }
 
 static uint8_t



CVS commit: src/sys/dev/spi

2019-07-04 Thread Kenichi Hashimoto
Module Name:src
Committed By:   hkenken
Date:   Thu Jul  4 11:13:26 UTC 2019

Modified Files:
src/sys/dev/spi: oj6sh.c

Log Message:
Avoid workqueue_check_duplication().


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/spi/oj6sh.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/pci/ixgbe

2019-07-04 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Thu Jul  4 09:02:24 UTC 2019

Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixv.c

Log Message:
 On ENETRESET case, not continue and quit the ifflags_cb() function because
if_init() will do the same thing.


To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.117 -r1.118 src/sys/dev/pci/ixgbe/ixv.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/pci/ixgbe

2019-07-04 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Thu Jul  4 09:02:24 UTC 2019

Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixv.c

Log Message:
 On ENETRESET case, not continue and quit the ifflags_cb() function because
if_init() will do the same thing.


To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.117 -r1.118 src/sys/dev/pci/ixgbe/ixv.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/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.191 src/sys/dev/pci/ixgbe/ixgbe.c:1.192
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.191	Tue Jul  2 08:38:48 2019
+++ src/sys/dev/pci/ixgbe/ixgbe.c	Thu Jul  4 09:02:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.191 2019/07/02 08:38:48 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.192 2019/07/04 09:02:24 msaitoh Exp $ */
 
 /**
 
@@ -6137,7 +6137,7 @@ ixgbe_ifflags_cb(struct ethercom *ec)
 {
 	struct ifnet *ifp = &ec->ec_if;
 	struct adapter *adapter = ifp->if_softc;
-	int change, rc = 0;
+	int change, rv = 0;
 
 	IXGBE_CORE_LOCK(adapter);
 
@@ -6145,17 +6145,19 @@ ixgbe_ifflags_cb(struct ethercom *ec)
 	if (change != 0)
 		adapter->if_flags = ifp->if_flags;
 
-	if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0)
-		rc = ENETRESET;
-	else if ((change & IFF_PROMISC) != 0)
+	if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0) {
+		rv = ENETRESET;
+		goto out;
+	} else if ((change & IFF_PROMISC) != 0)
 		ixgbe_set_promisc(adapter);
 
 	/* Set up VLAN support and filter */
 	ixgbe_setup_vlan_hw_support(adapter);
 
+out:
 	IXGBE_CORE_UNLOCK(adapter);
 
-	return rc;
+	return rv;
 }
 
 /

Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.117 src/sys/dev/pci/ixgbe/ixv.c:1.118
--- src/sys/dev/pci/ixgbe/ixv.c:1.117	Tue Jul  2 07:20:07 2019
+++ src/sys/dev/pci/ixgbe/ixv.c	Thu Jul  4 09:02:24 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.117 2019/07/02 07:20:07 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.118 2019/07/04 09:02:24 msaitoh Exp $*/
 
 /**
 
@@ -2730,7 +2730,7 @@ ixv_ifflags_cb(struct ethercom *ec)
 {
 	struct ifnet *ifp = &ec->ec_if;
 	struct adapter *adapter = ifp->if_softc;
-	int change, rc = 0;
+	int change, rv = 0;
 
 	IXGBE_CORE_LOCK(adapter);
 
@@ -2738,15 +2738,18 @@ ixv_ifflags_cb(struct ethercom *ec)
 	if (change != 0)
 		adapter->if_flags = ifp->if_flags;
 
-	if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0)
-		rc = ENETRESET;
+	if ((change & ~(IFF_CANTCHANGE | IFF_DEBUG)) != 0) {
+		rv = ENETRESET;
+		goto out;
+	}
 
 	/* Set up VLAN support and filter */
 	ixv_setup_vlan_support(adapter);
 
+out:
 	IXGBE_CORE_UNLOCK(adapter);
 
-	return rc;
+	return rv;
 }
 
 



CVS commit: src/sys/dev/pci/ixgbe

2019-07-04 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Thu Jul  4 08:56:35 UTC 2019

Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c

Log Message:
 Fix hung queue check when the queue number >= 31.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/pci/ixgbe/ix_txrx.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/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.53 src/sys/dev/pci/ixgbe/ix_txrx.c:1.54
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.53	Thu Jun 27 05:55:40 2019
+++ src/sys/dev/pci/ixgbe/ix_txrx.c	Thu Jul  4 08:56:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.53 2019/06/27 05:55:40 msaitoh Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.54 2019/07/04 08:56:35 msaitoh Exp $ */
 
 /**
 
@@ -233,7 +233,7 @@ ixgbe_mq_start(struct ifnet *ifp, struct
 		i = (cpu_index(curcpu()) % ncpu) % adapter->num_queues;
 
 	/* Check for a hung queue and pick alternative */
-	if (((1 << i) & adapter->active_queues) == 0)
+	if (((1ULL << i) & adapter->active_queues) == 0)
 		i = ffs64(adapter->active_queues);
 
 	txr = &adapter->tx_rings[i];



CVS commit: src/sys/dev/pci/ixgbe

2019-07-04 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Thu Jul  4 08:56:35 UTC 2019

Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c

Log Message:
 Fix hung queue check when the queue number >= 31.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/pci/ixgbe/ix_txrx.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.