[src/trunk]: src/sys/dev/pci/ixgbe Change macro name IXGBE_DEV_ID_82599_SFP_D...

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

details:   https://anonhg.NetBSD.org/src/rev/6ac452856772
branches:  trunk
changeset: 336290:6ac452856772
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Feb 24 14:14:50 2015 +0000

description:
Change macro name IXGBE_DEV_ID_82599_SFP_DELL to IXGBE_DEV_ID_82599_SFP_SF2.
Same as OpenBSD and Linux. No binary change.

diffstat:

 sys/dev/pci/ixgbe/ixgbe.c       |  4 ++--
 sys/dev/pci/ixgbe/ixgbe_82599.c |  4 ++--
 sys/dev/pci/ixgbe/ixgbe_api.c   |  4 ++--
 sys/dev/pci/ixgbe/ixgbe_type.h  |  4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diffs (86 lines):

diff -r d3a3fb8eae16 -r 6ac452856772 sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Tue Feb 24 14:08:07 2015 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Tue Feb 24 14:14:50 2015 +0000
@@ -59,7 +59,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*$FreeBSD: src/sys/dev/ixgbe/ixgbe.c,v 1.51 2011/04/25 23:34:21 jfv Exp $*/
-/*$NetBSD: ixgbe.c,v 1.19 2015/02/07 00:02:09 christos Exp $*/
+/*$NetBSD: ixgbe.c,v 1.20 2015/02/24 14:14:50 msaitoh Exp $*/
 
 #include "opt_inet.h"
 
@@ -107,7 +107,7 @@
        {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_COMBO_BACKPLANE, 0, 0, 0},
        {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_BACKPLANE_FCOE, 0, 0, 0},
        {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_SFP_FCOE, 0, 0, 0},
-       {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_SFP_DELL, 0, 0, 0},
+       {IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_SFP_SF2, 0, 0, 0},
        /* required last entry */
        {0, 0, 0, 0, 0}
 };
diff -r d3a3fb8eae16 -r 6ac452856772 sys/dev/pci/ixgbe/ixgbe_82599.c
--- a/sys/dev/pci/ixgbe/ixgbe_82599.c   Tue Feb 24 14:08:07 2015 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_82599.c   Tue Feb 24 14:14:50 2015 +0000
@@ -31,7 +31,7 @@
 
 ******************************************************************************/
 /*$FreeBSD: src/sys/dev/ixgbe/ixgbe_82599.c,v 1.6 2011/01/19 19:36:27 jfv Exp $*/
-/*$NetBSD: ixgbe_82599.c,v 1.3 2014/04/17 15:34:05 christos Exp $*/
+/*$NetBSD: ixgbe_82599.c,v 1.4 2015/02/24 14:14:50 msaitoh Exp $*/
 
 #include "ixgbe_type.h"
 #include "ixgbe_api.h"
@@ -434,7 +434,7 @@
                break;
        case IXGBE_DEV_ID_82599_SFP:
        case IXGBE_DEV_ID_82599_SFP_FCOE:
-       case IXGBE_DEV_ID_82599_SFP_DELL:
+       case IXGBE_DEV_ID_82599_SFP_SF2:
                media_type = ixgbe_media_type_fiber;
                break;
        case IXGBE_DEV_ID_82599_CX4:
diff -r d3a3fb8eae16 -r 6ac452856772 sys/dev/pci/ixgbe/ixgbe_api.c
--- a/sys/dev/pci/ixgbe/ixgbe_api.c     Tue Feb 24 14:08:07 2015 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_api.c     Tue Feb 24 14:14:50 2015 +0000
@@ -31,7 +31,7 @@
 
 ******************************************************************************/
 /*$FreeBSD: src/sys/dev/ixgbe/ixgbe_api.c,v 1.11 2010/11/26 22:46:32 jfv Exp $*/
-/*$NetBSD: ixgbe_api.c,v 1.2 2014/04/08 19:39:06 christos Exp $*/
+/*$NetBSD: ixgbe_api.c,v 1.3 2015/02/24 14:14:50 msaitoh Exp $*/
 
 #include "ixgbe_api.h"
 #include "ixgbe_common.h"
@@ -119,7 +119,7 @@
                case IXGBE_DEV_ID_82599_SFP_FCOE:
                case IXGBE_DEV_ID_82599_CX4:
                case IXGBE_DEV_ID_82599_T3_LOM:
-               case IXGBE_DEV_ID_82599_SFP_DELL:
+               case IXGBE_DEV_ID_82599_SFP_SF2:
                        hw->mac.type = ixgbe_mac_82599EB;
                        break;
                case IXGBE_DEV_ID_82599_VF:
diff -r d3a3fb8eae16 -r 6ac452856772 sys/dev/pci/ixgbe/ixgbe_type.h
--- a/sys/dev/pci/ixgbe/ixgbe_type.h    Tue Feb 24 14:08:07 2015 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_type.h    Tue Feb 24 14:14:50 2015 +0000
@@ -31,7 +31,7 @@
 
 ******************************************************************************/
 /*$FreeBSD: src/sys/dev/ixgbe/ixgbe_type.h,v 1.12 2011/01/19 19:36:27 jfv Exp $*/
-/*$NetBSD: ixgbe_type.h,v 1.5 2015/02/24 14:08:07 msaitoh Exp $*/
+/*$NetBSD: ixgbe_type.h,v 1.6 2015/02/24 14:14:50 msaitoh Exp $*/
 
 #ifndef _IXGBE_TYPE_H_
 #define _IXGBE_TYPE_H_
@@ -71,9 +71,9 @@
 #define IXGBE_DEV_ID_82599_BACKPLANE_FCOE      0x152A
 #define IXGBE_DEV_ID_82599_SFP_FCOE            0x1529
 #define IXGBE_DEV_ID_82599_XAUI_LOM            PCI_PRODUCT_INTEL_82599_XAUI_LOM
+#define IXGBE_DEV_ID_82599_SFP_SF2             0x154D
 #define IXGBE_DEV_ID_82599_T3_LOM              0x151C
 #define IXGBE_DEV_ID_82599_VF                  0x10ED
-#define IXGBE_DEV_ID_82599_SFP_DELL            0x154d
 
 /* General Registers */
 #define IXGBE_CTRL             0x00000