diff options
| author | sbruno <sbruno@FreeBSD.org> | 2016-02-11 16:16:10 +0000 |
|---|---|---|
| committer | sbruno <sbruno@FreeBSD.org> | 2016-02-11 16:16:10 +0000 |
| commit | 15873ac96fcc4e81a25d35e735a1fbae9d727360 (patch) | |
| tree | 694d2ee3865a0414e71188a2b6bf069828eb0021 /sys/dev/ixgbe/ixgbe_api.c | |
| parent | 9e8884f301206dff7661faacac42bef3557cc86c (diff) | |
| download | FreeBSD-src-15873ac96fcc4e81a25d35e735a1fbae9d727360.zip FreeBSD-src-15873ac96fcc4e81a25d35e735a1fbae9d727360.tar.gz | |
MFC r292674
Update ixgbe(4) to Intel FreeBSD Networking Group version 3.1.13-k.
MFC r292571 and r292697
Add support for X552 and X550T.
MFC r293334
Fix SFP module insertion post boot.
MFC r293338
Fix VF handling of VLANs for Amazon Cloud.
Reviewed by: erj smh ngie jeffrey.e.pieper@intel.com
Approved by: re (marius)
Relnotes: Yes
Sponsored by: Intel Corporation and Limelight Networks
Differential Revision: https://reviews.freebsd.org/D5117
Diffstat (limited to 'sys/dev/ixgbe/ixgbe_api.c')
| -rw-r--r-- | sys/dev/ixgbe/ixgbe_api.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/dev/ixgbe/ixgbe_api.c b/sys/dev/ixgbe/ixgbe_api.c index 9784e3c..0f4d973 100644 --- a/sys/dev/ixgbe/ixgbe_api.c +++ b/sys/dev/ixgbe/ixgbe_api.c @@ -35,8 +35,10 @@ #include "ixgbe_api.h" #include "ixgbe_common.h" +#define IXGBE_EMPTY_PARAM + static const u32 ixgbe_mvals_base[IXGBE_MVALS_IDX_LIMIT] = { - IXGBE_MVALS_INIT() + IXGBE_MVALS_INIT(IXGBE_EMPTY_PARAM) }; static const u32 ixgbe_mvals_X540[IXGBE_MVALS_IDX_LIMIT] = { @@ -113,6 +115,7 @@ s32 ixgbe_init_shared_code(struct ixgbe_hw *hw) status = IXGBE_ERR_DEVICE_NOT_SUPPORTED; break; } + hw->mac.max_link_up_time = IXGBE_LINK_UP_TIME; return status; } @@ -187,6 +190,7 @@ s32 ixgbe_set_mac_type(struct ixgbe_hw *hw) hw->mvals = ixgbe_mvals_X540; break; case IXGBE_DEV_ID_X550T: + case IXGBE_DEV_ID_X550T1: hw->mac.type = ixgbe_mac_X550; hw->mvals = ixgbe_mvals_X550; break; |
