diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-03-12 19:05:19 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-03-12 19:05:19 +0000 |
| commit | 4e07db359c9c712d10537e49bc9ed64fbfd5379e (patch) | |
| tree | 2318917051212e7ef38c27f546f4f84f0c57f3f6 /usr/src/uts/common/io/e1000api/e1000_api.c | |
| parent | 4761371227e50ad640ef47fc3ca0e6f8cad78682 (diff) | |
| parent | c124a83e09115de88ecccd4f689983f42a1d53bd (diff) | |
| download | illumos-joyent-4e07db359c9c712d10537e49bc9ed64fbfd5379e.tar.gz | |
[illumos-gate merge]
commit c124a83e09115de88ecccd4f689983f42a1d53bd
5689 Want support for newer Intel I218 parts
5690 Want support for newer Intel I210 parts
commit 087a28d18c24cf4938e8a2617b5127a2fd29ddf4
3446 Update bge to support missing 57xx/577xx devices
commit fc01d378bd20b13dcb27185d874fc628d851b161
5106 elfdump compiles using headers from the build system (fix noise)
Diffstat (limited to 'usr/src/uts/common/io/e1000api/e1000_api.c')
| -rw-r--r-- | usr/src/uts/common/io/e1000api/e1000_api.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/usr/src/uts/common/io/e1000api/e1000_api.c b/usr/src/uts/common/io/e1000api/e1000_api.c index cae5267c56..374ffa678e 100644 --- a/usr/src/uts/common/io/e1000api/e1000_api.c +++ b/usr/src/uts/common/io/e1000api/e1000_api.c @@ -1,6 +1,6 @@ /****************************************************************************** - Copyright (c) 2001-2013, Intel Corporation + Copyright (c) 2001-2014, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without @@ -293,6 +293,10 @@ s32 e1000_set_mac_type(struct e1000_hw *hw) case E1000_DEV_ID_PCH_LPT_I217_V: case E1000_DEV_ID_PCH_LPTLP_I218_LM: case E1000_DEV_ID_PCH_LPTLP_I218_V: + case E1000_DEV_ID_PCH_I218_LM2: + case E1000_DEV_ID_PCH_I218_V2: + case E1000_DEV_ID_PCH_I218_LM3: + case E1000_DEV_ID_PCH_I218_V3: mac->type = e1000_pch_lpt; break; case E1000_DEV_ID_82575EB_COPPER: @@ -329,9 +333,8 @@ s32 e1000_set_mac_type(struct e1000_hw *hw) case E1000_DEV_ID_I350_DA4: mac->type = e1000_i350; break; -#if defined(QV_RELEASE) && defined(SPRINGVILLE_FLASHLESS_HW) - case E1000_DEV_ID_I210_NVMLESS: -#endif /* QV_RELEASE && SPRINGVILLE_FLASHLESS_HW */ + case E1000_DEV_ID_I210_COPPER_FLASHLESS: + case E1000_DEV_ID_I210_SERDES_FLASHLESS: case E1000_DEV_ID_I210_COPPER: case E1000_DEV_ID_I210_COPPER_OEM1: case E1000_DEV_ID_I210_COPPER_IT: @@ -351,12 +354,12 @@ s32 e1000_set_mac_type(struct e1000_hw *hw) case E1000_DEV_ID_I350_VF_HV: mac->type = e1000_vfadapt_i350; break; + case E1000_DEV_ID_I354_BACKPLANE_1GBPS: case E1000_DEV_ID_I354_SGMII: case E1000_DEV_ID_I354_BACKPLANE_2_5GBPS: mac->type = e1000_i354; break; - default: /* Should never have loaded on this device */ ret_val = -E1000_ERR_MAC_INIT; @@ -829,10 +832,12 @@ void e1000_config_collision_dist(struct e1000_hw *hw) * * Sets a Receive Address Register (RAR) to the specified address. **/ -void e1000_rar_set(struct e1000_hw *hw, u8 *addr, u32 index) +int e1000_rar_set(struct e1000_hw *hw, u8 *addr, u32 index) { if (hw->mac.ops.rar_set) - hw->mac.ops.rar_set(hw, addr, index); + return hw->mac.ops.rar_set(hw, addr, index); + + return E1000_SUCCESS; } /** |