[src/netbsd-8]: src/sys/dev/pci/ixgbe Pull up following revision(s) (requeste...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/aa9f4cbd9a3a
branches:  netbsd-8
changeset: 434995:aa9f4cbd9a3a
user:      martin <martin%NetBSD.org@localhost>
date:      Tue May 15 13:37:24 2018 +0000

description:
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

diffstat:

 sys/dev/pci/ixgbe/ixv.c |  11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diffs (34 lines):

diff -r 59d6381d468a -r aa9f4cbd9a3a sys/dev/pci/ixgbe/ixv.c
--- a/sys/dev/pci/ixgbe/ixv.c   Mon May 14 19:24:10 2018 +0000
+++ b/sys/dev/pci/ixgbe/ixv.c   Tue May 15 13:37:24 2018 +0000
@@ -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 @@
 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 */