[src/trunk]: src/sys/dev/pci/ixgbe Reduce diff against FreeBSD. No functional...

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

details:   https://anonhg.NetBSD.org/src/rev/d067ad496c15
branches:  trunk
changeset: 825029:d067ad496c15
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Jun 27 05:01:51 2017 +0000

description:
Reduce diff against FreeBSD. No functional change.

diffstat:

 sys/dev/pci/ixgbe/ixgbe.c     |  4 ++--
 sys/dev/pci/ixgbe/ixgbe_api.c |  6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r ab5286e4ee0b -r d067ad496c15 sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Tue Jun 27 04:56:13 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Tue Jun 27 05:01:51 2017 +0000
@@ -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.91 2017/06/23 06:33:35 msaitoh Exp $*/
+/*$NetBSD: ixgbe.c,v 1.92 2017/06/27 05:01:51 msaitoh Exp $*/
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -5474,8 +5474,8 @@
 {
        struct sysctlnode node = *rnode;
        struct adapter  *adapter = (struct adapter *)node.sysctl_data;
-       int             error, fire = 0;
        struct ixgbe_hw *hw;
+       int error, fire = 0;
 
        hw = &adapter->hw;
 
diff -r ab5286e4ee0b -r d067ad496c15 sys/dev/pci/ixgbe/ixgbe_api.c
--- a/sys/dev/pci/ixgbe/ixgbe_api.c     Tue Jun 27 04:56:13 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_api.c     Tue Jun 27 05:01:51 2017 +0000
@@ -31,13 +31,15 @@
 
 ******************************************************************************/
 /*$FreeBSD: head/sys/dev/ixgbe/ixgbe_api.c 299200 2016-05-06 22:54:56Z pfg $*/
-/*$NetBSD: ixgbe_api.c,v 1.15 2016/12/05 08:50:29 msaitoh Exp $*/
+/*$NetBSD: ixgbe_api.c,v 1.16 2017/06/27 05:01:51 msaitoh Exp $*/
 
 #include "ixgbe_api.h"
 #include "ixgbe_common.h"
 
+#define IXGBE_EMPTY_PARAM
+
 static const u32 ixgbe_mvals_base[IXGBE_MVALS_IDX_LIMIT] = {
-       IXGBE_MVALS_INIT()
+       IXGBE_MVALS_INIT(IXGBE_EMPTY_PARAM)
 };
 
 static const u32 ixgbe_mvals_X540[IXGBE_MVALS_IDX_LIMIT] = {