mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-24 11:29:10 +00:00
Code Issues Releases Activity

This small change will allow this driver in HEAD to build

Browse Source 
on 6.3 as well as 7 :)
This commit is contained in:
Jack F Vogel 2008-05-19 23:01:11 +00:00
parent 2dc4c8e0e5
commit 77d4244f22
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=179136
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/dev/em/if_em.c
View File

@ -91,7 +91,7 @@ int em_display_debug_stats = 0;
/*********************************************************************
* Driver version:
*********************************************************************/
char em_driver_version[] = "6.9.0";
char em_driver_version[] = "6.9.2";
/*********************************************************************
@ -192,6 +192,7 @@ static em_vendor_info_t em_vendor_info_array[] =
{ 0x8086, E1000_DEV_ID_ICH9_IFE, PCI_ANY_ID, PCI_ANY_ID, 0},
{ 0x8086, E1000_DEV_ID_ICH9_IFE_GT, PCI_ANY_ID, PCI_ANY_ID, 0},
{ 0x8086, E1000_DEV_ID_ICH9_IFE_G, PCI_ANY_ID, PCI_ANY_ID, 0},
{ 0x8086, E1000_DEV_ID_ICH9_BM, PCI_ANY_ID, PCI_ANY_ID, 0},
{ 0x8086, E1000_DEV_ID_82574L, PCI_ANY_ID, PCI_ANY_ID, 0},
{ 0x8086, E1000_DEV_ID_ICH10_D_BM_LM, PCI_ANY_ID, PCI_ANY_ID, 0},
{ 0x8086, E1000_DEV_ID_ICH10_D_BM_LF, PCI_ANY_ID, PCI_ANY_ID, 0},
@ -2847,7 +2848,11 @@ em_allocate_msix(struct adapter *adapter)
/* First slot to RX */
if ((error = bus_setup_intr(dev, adapter->res[0],
#if __FreeBSD_version > 700000
INTR_TYPE_NET | INTR_MPSAFE, NULL, em_msix_rx, adapter,
#else /* 6.X */
INTR_TYPE_NET | INTR_MPSAFE, em_msix_rx, adapter,
#endif
&adapter->tag[0])) != 0) {
device_printf(dev, "Failed to register RX handler");
return (error);
@ -2855,7 +2860,11 @@ em_allocate_msix(struct adapter *adapter)
/* Next TX */
if ((error = bus_setup_intr(dev, adapter->res[1],
#if __FreeBSD_version > 700000
INTR_TYPE_NET | INTR_MPSAFE, NULL, em_msix_tx, adapter,
#else /* 6.X */
INTR_TYPE_NET | INTR_MPSAFE, em_msix_tx, adapter,
#endif
&adapter->tag[1])) != 0) {
device_printf(dev, "Failed to register TX handler");
return (error);
@ -2863,7 +2872,11 @@ em_allocate_msix(struct adapter *adapter)
/* And Link */
if ((error = bus_setup_intr(dev, adapter->res[2],
#if __FreeBSD_version > 700000
INTR_TYPE_NET | INTR_MPSAFE, NULL, em_msix_link, adapter,
#else /* 6.X */
INTR_TYPE_NET | INTR_MPSAFE, em_msix_link, adapter,
#endif
&adapter->tag[2])) != 0) {
device_printf(dev, "Failed to register TX handler");
return (error);