diff options
| author | jfv <jfv@FreeBSD.org> | 2009-12-08 01:07:44 +0000 |
|---|---|---|
| committer | jfv <jfv@FreeBSD.org> | 2009-12-08 01:07:44 +0000 |
| commit | fe4debf5259516d09b353ac063fdd9b779ecb35c (patch) | |
| tree | 1cdfb634e42282edf41b9a28c0d8cbb9d37a57be /sys/dev/e1000/e1000_api.c | |
| parent | c78c495a2fdd7fefc465b3b32ac2df27d6b87ed1 (diff) | |
| download | FreeBSD-src-fe4debf5259516d09b353ac063fdd9b779ecb35c.zip FreeBSD-src-fe4debf5259516d09b353ac063fdd9b779ecb35c.tar.gz | |
Resync with Intel versions of both the em and igb
drivers. These add new hardware support, most importantly
the pch (i5 chipset) in the em driver. Also, both drivers
now have the simplified (and I hope improved) watchdog
code. The igb driver uses the new RX cleanup that I
first implemented in ixgbe.
em - version 6.9.24
igb - version 1.8.4
Diffstat (limited to 'sys/dev/e1000/e1000_api.c')
| -rw-r--r-- | sys/dev/e1000/e1000_api.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/sys/dev/e1000/e1000_api.c b/sys/dev/e1000/e1000_api.c index 8188658..154eff9 100644 --- a/sys/dev/e1000/e1000_api.c +++ b/sys/dev/e1000/e1000_api.c @@ -232,6 +232,7 @@ s32 e1000_set_mac_type(struct e1000_hw *hw) case E1000_DEV_ID_ICH8_IGP_M_AMT: case E1000_DEV_ID_ICH8_IGP_AMT: case E1000_DEV_ID_ICH8_IGP_C: + case E1000_DEV_ID_ICH8_82567V_3: mac->type = e1000_ich8lan; break; case E1000_DEV_ID_ICH9_IFE: @@ -269,9 +270,21 @@ s32 e1000_set_mac_type(struct e1000_hw *hw) case E1000_DEV_ID_82576_SERDES: case E1000_DEV_ID_82576_QUAD_COPPER: case E1000_DEV_ID_82576_NS: + case E1000_DEV_ID_82576_NS_SERDES: case E1000_DEV_ID_82576_SERDES_QUAD: mac->type = e1000_82576; break; + case E1000_DEV_ID_82580_COPPER: + case E1000_DEV_ID_82580_FIBER: + case E1000_DEV_ID_82580_SERDES: + case E1000_DEV_ID_82580_SGMII: + case E1000_DEV_ID_82580_COPPER_DUAL: + mac->type = e1000_82580; + break; + case E1000_DEV_ID_82580_ER: + case E1000_DEV_ID_82580_ER_DUAL: + mac->type = e1000_82580er; + break; default: /* Should never have loaded on this device */ ret_val = -E1000_ERR_MAC_INIT; @@ -362,6 +375,8 @@ s32 e1000_setup_init_funcs(struct e1000_hw *hw, bool init_device) break; case e1000_82575: case e1000_82576: + case e1000_82580: + case e1000_82580er: e1000_init_function_pointers_82575(hw); break; default: |
