Module Name: src
Committed By: christos
Date: Tue Apr 8 19:39:06 UTC 2014
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixgbe_82599.c ixgbe_api.c ixgbe_type.h
Log Message:
Add dell's flavor (from uwe, in current-users@)
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/ixgbe/ixgbe_82599.c \
src/sys/dev/pci/ixgbe/ixgbe_api.c 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.9 src/sys/dev/pci/ixgbe/ixgbe.c:1.10
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.9 Sun Mar 30 09:14:40 2014
+++ src/sys/dev/pci/ixgbe/ixgbe.c Tue Apr 8 15:39:06 2014
@@ -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.9 2014/03/30 13:14:40 skrll Exp $*/
+/*$NetBSD: ixgbe.c,v 1.10 2014/04/08 19:39:06 christos Exp $*/
#include "opt_inet.h"
@@ -107,6 +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},
/* 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.1 src/sys/dev/pci/ixgbe/ixgbe_82599.c:1.2
--- src/sys/dev/pci/ixgbe/ixgbe_82599.c:1.1 Fri Aug 12 17:55:29 2011
+++ src/sys/dev/pci/ixgbe/ixgbe_82599.c Tue Apr 8 15:39:06 2014
@@ -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.1 2011/08/12 21:55:29 dyoung Exp $*/
+/*$NetBSD: ixgbe_82599.c,v 1.2 2014/04/08 19:39:06 christos Exp $*/
#include "ixgbe_type.h"
#include "ixgbe_api.h"
@@ -434,6 +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:
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.1 src/sys/dev/pci/ixgbe/ixgbe_api.c:1.2
--- src/sys/dev/pci/ixgbe/ixgbe_api.c:1.1 Fri Aug 12 17:55:29 2011
+++ src/sys/dev/pci/ixgbe/ixgbe_api.c Tue Apr 8 15:39:06 2014
@@ -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.1 2011/08/12 21:55:29 dyoung Exp $*/
+/*$NetBSD: ixgbe_api.c,v 1.2 2014/04/08 19:39:06 christos Exp $*/
#include "ixgbe_api.h"
#include "ixgbe_common.h"
@@ -119,6 +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:
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.1 src/sys/dev/pci/ixgbe/ixgbe_type.h:1.2
--- src/sys/dev/pci/ixgbe/ixgbe_type.h:1.1 Fri Aug 12 17:55:29 2011
+++ src/sys/dev/pci/ixgbe/ixgbe_type.h Tue Apr 8 15:39:06 2014
@@ -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.1 2011/08/12 21:55:29 dyoung Exp $*/
+/*$NetBSD: ixgbe_type.h,v 1.2 2014/04/08 19:39:06 christos Exp $*/
#ifndef _IXGBE_TYPE_H_
#define _IXGBE_TYPE_H_
@@ -73,6 +73,7 @@
#define IXGBE_DEV_ID_82599_XAUI_LOM PCI_PRODUCT_INTEL_82599_XAUI_LOM
#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
