Module Name: src
Committed By: msaitoh
Date: Tue Feb 24 14:14:50 UTC 2015
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixgbe_82599.c ixgbe_api.c ixgbe_type.h
Log Message:
Change macro name IXGBE_DEV_ID_82599_SFP_DELL to IXGBE_DEV_ID_82599_SFP_SF2.
Same as OpenBSD and Linux. No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/ixgbe/ixgbe_82599.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/ixgbe/ixgbe_api.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/ixgbe/ixgbe_type.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.19 src/sys/dev/pci/ixgbe/ixgbe.c:1.20
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.19 Sat Feb 7 00:02:09 2015
+++ src/sys/dev/pci/ixgbe/ixgbe.c Tue Feb 24 14:14:50 2015
@@ -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 @@ static ixgbe_vendor_info_t ixgbe_vendor_
{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}
};
Index: src/sys/dev/pci/ixgbe/ixgbe_82599.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_82599.c:1.3 src/sys/dev/pci/ixgbe/ixgbe_82599.c:1.4
--- src/sys/dev/pci/ixgbe/ixgbe_82599.c:1.3 Thu Apr 17 15:34:05 2014
+++ src/sys/dev/pci/ixgbe/ixgbe_82599.c Tue Feb 24 14:14:50 2015
@@ -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 @@ enum ixgbe_media_type ixgbe_get_media_ty
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:
Index: src/sys/dev/pci/ixgbe/ixgbe_api.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_api.c:1.2 src/sys/dev/pci/ixgbe/ixgbe_api.c:1.3
--- src/sys/dev/pci/ixgbe/ixgbe_api.c:1.2 Tue Apr 8 19:39:06 2014
+++ src/sys/dev/pci/ixgbe/ixgbe_api.c Tue Feb 24 14:14:50 2015
@@ -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 @@ s32 ixgbe_set_mac_type(struct ixgbe_hw *
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:
Index: src/sys/dev/pci/ixgbe/ixgbe_type.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_type.h:1.5 src/sys/dev/pci/ixgbe/ixgbe_type.h:1.6
--- src/sys/dev/pci/ixgbe/ixgbe_type.h:1.5 Tue Feb 24 14:08:07 2015
+++ src/sys/dev/pci/ixgbe/ixgbe_type.h Tue Feb 24 14:14:50 2015
@@ -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
