Author: dumbbell
Date: Wed Mar 5 19:48:47 2014
New Revision: 262803
URL: http://svnweb.freebsd.org/changeset/base/262803
Log:
MFC r253102:
Remove redundant definitions to appease tinderbox.
Note: This MFC is required by a future merge of changes to amd64's and
i386's atomic.h.
Modified:
stable/9/sys/dev/ixgb/if_ixgb.c
stable/9/sys/dev/ixgb/ixgb_ids.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/ixgb/if_ixgb.c
==============================================================================
--- stable/9/sys/dev/ixgb/if_ixgb.c Wed Mar 5 19:45:21 2014
(r262802)
+++ stable/9/sys/dev/ixgb/if_ixgb.c Wed Mar 5 19:48:47 2014
(r262803)
@@ -72,8 +72,8 @@ char ixgb_copyright[] = "Copy
static ixgb_vendor_info_t ixgb_vendor_info_array[] =
{
/* Intel(R) PRO/10000 Network Connection */
- {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX, PCI_ANY_ID, PCI_ANY_ID, 0},
- {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR, PCI_ANY_ID, PCI_ANY_ID, 0},
+ {IXGB_VENDOR_ID, IXGB_DEVICE_ID_82597EX, PCI_ANY_ID, PCI_ANY_ID, 0},
+ {IXGB_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR, PCI_ANY_ID, PCI_ANY_ID, 0},
/* required last entry */
{0, 0, 0, 0, 0}
};
Modified: stable/9/sys/dev/ixgb/ixgb_ids.h
==============================================================================
--- stable/9/sys/dev/ixgb/ixgb_ids.h Wed Mar 5 19:45:21 2014
(r262802)
+++ stable/9/sys/dev/ixgb/ixgb_ids.h Wed Mar 5 19:48:47 2014
(r262803)
@@ -37,13 +37,9 @@
#define _IXGB_IDS_H_
/**********************************************************************
-** The Device and Vendor IDs for 10 Gigabit MACs
+** The Device IDs for 10 Gigabit MACs
**********************************************************************/
-#define INTEL_VENDOR_ID 0x8086
-#define INTEL_SUBVENDOR_ID 0x8086
-
-
#define IXGB_DEVICE_ID_82597EX 0x1048 /* Cibolo A1, -LR (1310nm) */
#define IXGB_DEVICE_ID_82597EX_SR 0x1A48 /* Cibolo B0, -SR (850nm) */
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
