[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/5045bce22956
branches:  trunk
changeset: 350748:5045bce22956
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Jan 19 06:56:33 2017 +0000

description:
Reduce diff against FreeBSD. No functional change.

diffstat:

 sys/dev/pci/ixgbe/ix_txrx.c      |  4 ++--
 sys/dev/pci/ixgbe/ixgbe_common.c |  4 ++--
 sys/dev/pci/ixgbe/ixgbe_phy.c    |  4 ++--
 sys/dev/pci/ixgbe/ixgbe_type.h   |  4 ++--
 sys/dev/pci/ixgbe/ixgbe_x540.c   |  2 +-
 sys/dev/pci/ixgbe/ixgbe_x550.c   |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diffs (115 lines):

diff -r 905cbd79cf12 -r 5045bce22956 sys/dev/pci/ixgbe/ix_txrx.c
--- a/sys/dev/pci/ixgbe/ix_txrx.c       Thu Jan 19 03:39:16 2017 +0000
+++ b/sys/dev/pci/ixgbe/ix_txrx.c       Thu Jan 19 06:56:33 2017 +0000
@@ -59,7 +59,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*$FreeBSD: head/sys/dev/ixgbe/ix_txrx.c 301538 2016-06-07 04:51:50Z sephe $*/
-/*$NetBSD: ix_txrx.c,v 1.15 2017/01/18 08:15:22 msaitoh Exp $*/
+/*$NetBSD: ix_txrx.c,v 1.16 2017/01/19 06:56:33 msaitoh Exp $*/
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -516,6 +516,7 @@
        return 0;
 }
 
+
 /*********************************************************************
  *
  *  Allocate memory for tx_buffer structures. The tx_buffer stores all
@@ -2396,4 +2397,3 @@
 fail:
        return (error);
 }
-
diff -r 905cbd79cf12 -r 5045bce22956 sys/dev/pci/ixgbe/ixgbe_common.c
--- a/sys/dev/pci/ixgbe/ixgbe_common.c  Thu Jan 19 03:39:16 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_common.c  Thu Jan 19 06:56:33 2017 +0000
@@ -31,7 +31,7 @@
 
 ******************************************************************************/
 /*$FreeBSD: head/sys/dev/ixgbe/ixgbe_common.c 299200 2016-05-06 22:54:56Z pfg $*/
-/*$NetBSD: ixgbe_common.c,v 1.11 2016/12/05 08:50:29 msaitoh Exp $*/
+/*$NetBSD: ixgbe_common.c,v 1.12 2017/01/19 06:56:33 msaitoh Exp $*/
 
 #include "ixgbe_common.h"
 #include "ixgbe_phy.h"
@@ -201,7 +201,7 @@
        }
 
        if (!supported) {
-       ERROR_REPORT2(IXGBE_ERROR_UNSUPPORTED,
+               ERROR_REPORT2(IXGBE_ERROR_UNSUPPORTED,
                      "Device %x does not support flow control autoneg",
                      hw->device_id);
        }
diff -r 905cbd79cf12 -r 5045bce22956 sys/dev/pci/ixgbe/ixgbe_phy.c
--- a/sys/dev/pci/ixgbe/ixgbe_phy.c     Thu Jan 19 03:39:16 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_phy.c     Thu Jan 19 06:56:33 2017 +0000
@@ -31,7 +31,7 @@
 
 ******************************************************************************/
 /*$FreeBSD: head/sys/dev/ixgbe/ixgbe_phy.c 303032 2016-07-19 17:31:48Z sbruno $*/
-/*$NetBSD: ixgbe_phy.c,v 1.10 2016/12/05 08:50:29 msaitoh Exp $*/
+/*$NetBSD: ixgbe_phy.c,v 1.11 2017/01/19 06:56:33 msaitoh Exp $*/
 
 #include "ixgbe_api.h"
 #include "ixgbe_common.h"
@@ -1535,7 +1535,7 @@
                                hw->phy.type = ixgbe_phy_sfp_intel;
                                break;
                        default:
-                                       hw->phy.type = ixgbe_phy_sfp_unknown;
+                               hw->phy.type = ixgbe_phy_sfp_unknown;
                                break;
                        }
                }
diff -r 905cbd79cf12 -r 5045bce22956 sys/dev/pci/ixgbe/ixgbe_type.h
--- a/sys/dev/pci/ixgbe/ixgbe_type.h    Thu Jan 19 03:39:16 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_type.h    Thu Jan 19 06:56:33 2017 +0000
@@ -31,7 +31,7 @@
 
 ******************************************************************************/
 /*$FreeBSD: head/sys/dev/ixgbe/ixgbe_type.h 299200 2016-05-06 22:54:56Z pfg $*/
-/*$NetBSD: ixgbe_type.h,v 1.17 2016/12/05 08:50:29 msaitoh Exp $*/
+/*$NetBSD: ixgbe_type.h,v 1.18 2017/01/19 06:56:33 msaitoh Exp $*/
 
 #ifndef _IXGBE_TYPE_H_
 #define _IXGBE_TYPE_H_
@@ -121,10 +121,10 @@
 #define IXGBE_SUBDEV_ID_82599_SFP_LOM          0x06EE
 #define IXGBE_DEV_ID_82599_BACKPLANE_FCOE      0x152A
 #define IXGBE_DEV_ID_82599_SFP_FCOE            0x1529
+#define IXGBE_DEV_ID_82599_SFP_EM              0x1507
 #define IXGBE_DEV_ID_82599_SFP_SF2             0x154D
 #define IXGBE_DEV_ID_82599_SFP_SF_QP           0x154A
 #define IXGBE_DEV_ID_82599_QSFP_SF_QP          0x1558
-#define IXGBE_DEV_ID_82599_SFP_EM              0x1507
 #define IXGBE_DEV_ID_82599EN_SFP               0x1557
 #define IXGBE_SUBDEV_ID_82599EN_SFP_OCP1       0x0001
 #define IXGBE_DEV_ID_82599_XAUI_LOM            PCI_PRODUCT_INTEL_82599_XAUI_LOM
diff -r 905cbd79cf12 -r 5045bce22956 sys/dev/pci/ixgbe/ixgbe_x540.c
--- a/sys/dev/pci/ixgbe/ixgbe_x540.c    Thu Jan 19 03:39:16 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_x540.c    Thu Jan 19 06:56:33 2017 +0000
@@ -82,7 +82,7 @@
        /* PHY */
        phy->ops.init = ixgbe_init_phy_ops_generic;
        phy->ops.reset = NULL;
-               phy->ops.set_phy_power = ixgbe_set_copper_phy_power;
+       phy->ops.set_phy_power = ixgbe_set_copper_phy_power;
 
        /* MAC */
        mac->ops.reset_hw = ixgbe_reset_hw_X540;
diff -r 905cbd79cf12 -r 5045bce22956 sys/dev/pci/ixgbe/ixgbe_x550.c
--- a/sys/dev/pci/ixgbe/ixgbe_x550.c    Thu Jan 19 03:39:16 2017 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_x550.c    Thu Jan 19 06:56:33 2017 +0000
@@ -965,7 +965,7 @@
                num_qs = 4;  /* 32 VFs / pools */
                bitmask = 0x0000000F;
                break;
-       default:            /* 64 VFs / pools */
+       default:            /* 64 VFs / pools */
                num_qs = 2;
                bitmask = 0x00000003;
                break;