Module Name: src
Committed By: martin
Date: Tue May 15 13:37:24 UTC 2018
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-8]: ixv.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #824):
sys/dev/pci/ixgbe/ixv.c: revision 1.97
Fix panic or hangup when "sysctl -w hw.ixgN.debug=1".
XXX pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.56.2.14 -r1.56.2.15 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/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.56.2.14 src/sys/dev/pci/ixgbe/ixv.c:1.56.2.15
--- src/sys/dev/pci/ixgbe/ixv.c:1.56.2.14 Sat Apr 14 10:25:11 2018
+++ src/sys/dev/pci/ixgbe/ixv.c Tue May 15 13:37:24 2018
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.56.2.14 2018/04/14 10:25:11 martin Exp $*/
+/*$NetBSD: ixv.c,v 1.56.2.15 2018/05/15 13:37:24 martin Exp $*/
/******************************************************************************
@@ -2603,21 +2603,18 @@ ixv_print_debug_info(struct adapter *ada
static int
ixv_sysctl_debug(SYSCTLFN_ARGS)
{
- struct sysctlnode node;
- struct adapter *adapter;
+ struct sysctlnode node = *rnode;
+ struct adapter *adapter = (struct adapter *)node.sysctl_data;
int error, result;
- node = *rnode;
node.sysctl_data = &result;
error = sysctl_lookup(SYSCTLFN_CALL(&node));
if (error || newp == NULL)
return error;
- if (result == 1) {
- adapter = (struct adapter *)node.sysctl_data;
+ if (result == 1)
ixv_print_debug_info(adapter);
- }
return 0;
} /* ixv_sysctl_debug */
