diff options
author | andrew-elder <aelder@audioscience.com> | 2018-03-20 07:54:27 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-20 07:54:27 -0400 |
commit | 31e8e1183180817889568ab3a74a0be4db7b6a03 (patch) | |
tree | e20c68acdbea827bdaf3722ae967abf8b9d74d95 | |
parent | 4293d76176404e20cab66cda0f29bdff257e70da (diff) | |
parent | d17f251c749ff2111c40ca36f3ba9695b7b6552d (diff) | |
download | Open-AVB-31e8e1183180817889568ab3a74a0be4db7b6a03.tar.gz |
Merge pull request #768 from jfornal/new_dev_id_only
New dev id for i210 igb_avb
-rw-r--r-- | kmod/igb/e1000_api.c | 1 | ||||
-rw-r--r-- | kmod/igb/e1000_hw.h | 1 | ||||
-rw-r--r-- | kmod/igb/igb_main.c | 1 | ||||
-rw-r--r-- | lib/igb/e1000_hw.h | 1 | ||||
-rw-r--r-- | lib/igb/igb.c | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/kmod/igb/e1000_api.c b/kmod/igb/e1000_api.c index 54faa686..87bccbd1 100644 --- a/kmod/igb/e1000_api.c +++ b/kmod/igb/e1000_api.c @@ -187,6 +187,7 @@ s32 e1000_set_mac_type(struct e1000_hw *hw) case E1000_DEV_ID_I210_FIBER: case E1000_DEV_ID_I210_SERDES: case E1000_DEV_ID_I210_SGMII: + case E1000_DEV_ID_I210_AUTOMOTIVE: mac->type = e1000_i210; break; case E1000_DEV_ID_I211_COPPER: diff --git a/kmod/igb/e1000_hw.h b/kmod/igb/e1000_hw.h index 3bcecf19..74cb22ee 100644 --- a/kmod/igb/e1000_hw.h +++ b/kmod/igb/e1000_hw.h @@ -59,6 +59,7 @@ struct e1000_hw; #define E1000_DEV_ID_I210_FIBER 0x1536 #define E1000_DEV_ID_I210_SERDES 0x1537 #define E1000_DEV_ID_I210_SGMII 0x1538 +#define E1000_DEV_ID_I210_AUTOMOTIVE 0x15F6 #define E1000_DEV_ID_I210_COPPER_FLASHLESS 0x157B #define E1000_DEV_ID_I210_SERDES_FLASHLESS 0x157C #define E1000_DEV_ID_I211_COPPER 0x1539 diff --git a/kmod/igb/igb_main.c b/kmod/igb/igb_main.c index 95286e49..3ae792c0 100644 --- a/kmod/igb/igb_main.c +++ b/kmod/igb/igb_main.c @@ -96,6 +96,7 @@ static const struct pci_device_id igb_pci_tbl[] = { { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_FIBER) }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_SERDES) }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_SGMII) }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_AUTOMOTIVE) }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_COPPER_FLASHLESS) }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_SERDES_FLASHLESS) }, /* required last entry */ diff --git a/lib/igb/e1000_hw.h b/lib/igb/e1000_hw.h index 1a3c46c7..1732d502 100644 --- a/lib/igb/e1000_hw.h +++ b/lib/igb/e1000_hw.h @@ -71,6 +71,7 @@ struct e1000_hw; #define E1000_DEV_ID_I210_FIBER 0x1536 #define E1000_DEV_ID_I210_SERDES 0x1537 #define E1000_DEV_ID_I210_SGMII 0x1538 +#define E1000_DEV_ID_I210_AUTOMOTIVE 0x15F6 #define E1000_DEV_ID_I210_COPPER_FLASHLESS 0x157B #define E1000_DEV_ID_I210_SERDES_FLASHLESS 0x157C #define E1000_DEV_ID_I211_COPPER 0x1539 diff --git a/lib/igb/igb.c b/lib/igb/igb.c index d59a0fcb..0f5ecd5a 100644 --- a/lib/igb/igb.c +++ b/lib/igb/igb.c @@ -79,6 +79,7 @@ static igb_vendor_info_t igb_vendor_info_array[] = { { 0x8086, E1000_DEV_ID_I210_SERDES_FLASHLESS, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, E1000_DEV_ID_I210_SGMII, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_I210_AUTOMOTIVE, PCI_ANY_ID, PCI_ANY_ID, 0}, /* required last entry */ { 0, 0, 0, 0, 0} }; |