Module Name: src
Committed By: msaitoh
Date: Wed Jan 18 10:18:40 UTC 2017
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixgbe.h
Log Message:
Fix sysctl stuff. Make the top sysctl node and keep the pointer.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/ixgbe/ixgbe.h
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.60 src/sys/dev/pci/ixgbe/ixgbe.c:1.61
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.60 Wed Jan 18 08:23:03 2017
+++ src/sys/dev/pci/ixgbe/ixgbe.c Wed Jan 18 10:18:40 2017
@@ -59,7 +59,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*$FreeBSD: head/sys/dev/ixgbe/if_ix.c 302384 2016-07-07 03:39:18Z sbruno $*/
-/*$NetBSD: ixgbe.c,v 1.60 2017/01/18 08:23:03 msaitoh Exp $*/
+/*$NetBSD: ixgbe.c,v 1.61 2017/01/18 10:18:40 msaitoh Exp $*/
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -4437,6 +4437,9 @@ ixgbe_sysctl_instance(struct adapter *ad
int rc;
const struct sysctlnode *rnode;
+ if (adapter->sysctltop != NULL)
+ return adapter->sysctltop;
+
log = &adapter->sysctllog;
dvname = device_xname(adapter->dev);
Index: src/sys/dev/pci/ixgbe/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.18 src/sys/dev/pci/ixgbe/ixgbe.h:1.19
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.18 Mon Dec 5 08:50:29 2016
+++ src/sys/dev/pci/ixgbe/ixgbe.h Wed Jan 18 10:18:40 2017
@@ -59,7 +59,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*$FreeBSD: head/sys/dev/ixgbe/ixgbe.h 303890 2016-08-09 19:32:06Z dumbbell $*/
-/*$NetBSD: ixgbe.h,v 1.18 2016/12/05 08:50:29 msaitoh Exp $*/
+/*$NetBSD: ixgbe.h,v 1.19 2017/01/18 10:18:40 msaitoh Exp $*/
#ifndef _IXGBE_H_
@@ -617,6 +617,7 @@ struct adapter {
u64 noproto;
#endif
struct sysctllog *sysctllog;
+ const struct sysctlnode *sysctltop;
ixgbe_extmem_head_t jcl_head;
};
