diff options
| author | Renato Botelho <renato@netgate.com> | 2015-11-24 07:16:07 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-11-24 07:16:07 -0200 |
| commit | 0198089008314a6920ed8427f91c2b734c0d4369 (patch) | |
| tree | 1af97d1de7dc7828ca8ee6cbf4fcded1d7f2c1f3 /sys/conf/NOTES | |
| parent | a569aca1d382bf02a5a2d9bd8a9b0e0bb6450cca (diff) | |
| parent | 4b6a65d9c084e4d5381e5bccbe02d1fb30290b90 (diff) | |
| download | FreeBSD-src-0198089008314a6920ed8427f91c2b734c0d4369.zip FreeBSD-src-0198089008314a6920ed8427f91c2b734c0d4369.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/conf/NOTES')
| -rw-r--r-- | sys/conf/NOTES | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 99c3d0b..e05e366 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -351,6 +351,9 @@ options COMPAT_FREEBSD6 # Enable FreeBSD7 compatibility syscalls options COMPAT_FREEBSD7 +# Enable Linux Kernel Programming Interface +#options COMPAT_LINUXKPI + # # These three options provide support for System V Interface # Definition-style interprocess communication, in the form of shared @@ -1954,6 +1957,8 @@ device xmphy # XaQti XMAC II # 88E8062, 88E8035, 88E8036, 88E8038, 88E8050, 88E8052, 88E8053, # 88E8055, 88E8056 and D-Link 560T/550SX. # lmc: Support for the LMC/SBE wide-area network interface cards. +# mlx5: Mellanox ConnectX-4 and ConnectX-4 LX IB and Eth shared code module. +# mlx5en:Mellanox ConnectX-4 and ConnectX-4 LX PCIe Ethernet adapters. # my: Myson Fast Ethernet (MTD80X, MTD89X) # nge: Support for PCI gigabit ethernet adapters based on the National # Semiconductor DP83820 and DP83821 chipset. This includes the @@ -2072,6 +2077,8 @@ device gem # Apple GMAC/Sun ERI/Sun GEM device hme # Sun HME (Happy Meal Ethernet) device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet device lge # Level 1 LXT1001 gigabit Ethernet +#device mlx5 # Shared code module between IB and Ethernet +#device mlx5en # Mellanox ConnectX-4 and ConnectX-4 LX device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet device my # Myson Fast Ethernet (MTD80X, MTD89X) device nge # NatSemi DP83820 gigabit Ethernet |
