diff options
| author | erj <erj@FreeBSD.org> | 2015-05-27 17:44:11 +0000 |
|---|---|---|
| committer | erj <erj@FreeBSD.org> | 2015-05-27 17:44:11 +0000 |
| commit | e12c5d1ed6e67d05e92e7300d4b38cff76215ae7 (patch) | |
| tree | c721017df7b05eabfe8fc6f76e956a5ae58ff508 /sys/amd64/conf/GENERIC | |
| parent | 38c6ad8c69b6e6ab7fd5b8a9089fa30ea3855bed (diff) | |
| download | FreeBSD-src-e12c5d1ed6e67d05e92e7300d4b38cff76215ae7.zip FreeBSD-src-e12c5d1ed6e67d05e92e7300d4b38cff76215ae7.tar.gz | |
MFC ixgbe commits for 10.2:
- r280182 - Split the driver into independent pf/vf loadables
- r280197 - Resolve build issues
- r280204 - Fix multiple same-name devclasses
- r280228 - Fix i386 LINT build issues / remove unused variable
- r280252 - Fix building ixgbe with gcc
- r280962 - Make changes to busdma code similar to r257541
- r281772 & r281773 - Remove unused variable
- partial r282280 - stats counter update (ix-only)
- r282289 - Add X550 support
- r282290 - Add X550 makefile updates
- r282293 - Add ixgbe_x550.c to conf/files
- r282299 - Fix gcc compile (extraneous extern declaration)
Finally, add ix_txrx.c to conf/files because it's required for compile in stable/10.
Approved by: jfv (mentor)
Diffstat (limited to 'sys/amd64/conf/GENERIC')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index b0138c1..5c217e9 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -211,7 +211,8 @@ device bxe # Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel PRO/1000 Gigabit Ethernet Family device igb # Intel PRO/1000 PCIE Server Gigabit Family -device ixgbe # Intel PRO/10GbE PCIE Ethernet Family +device ix # Intel PRO/10GbE PCIE PF Ethernet +device ixv # Intel PRO/10GbE PCIE VF Ethernet device ixl # Intel XL710 40Gbe PCIE Ethernet device ixlv # Intel XL710 40Gbe VF PCIE Ethernet device le # AMD Am7900 LANCE and Am79C9xx PCnet |
