svn commit: r312085 - in stable: 10/sys/conf 11/sys/conf

[John Baldwin]

Author: jhb
Date: Fri Jan 13 21:42:36 2017
New Revision: 312085
URL: https://svnweb.freebsd.org/changeset/base/312085

Log:
  MFC 304492,310721,310734: Update cxgbe info in NOTES.
  
  304492:
  Move cxgb and cxgbe down to the non-mii PCI NIC section.
  
  310721:
  Mention T6 and 100GbE in description of cxgbe.
  
  310734:
  Note that the Chelsio T6 also supports 25Gbps.
  
  To avoid overflowing 80 columns, condense the cxgbe description a bit.

Modified:
  stable/10/sys/conf/NOTES
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/conf/NOTES
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/sys/conf/NOTES
==============================================================================
--- stable/10/sys/conf/NOTES	Fri Jan 13 21:30:18 2017	(r312084)
+++ stable/10/sys/conf/NOTES	Fri Jan 13 21:42:36 2017	(r312085)
@@ -1922,8 +1922,9 @@ device		xmphy		# XaQti XMAC II
 # cm:	Arcnet SMC COM90c26 / SMC COM90c56
 #	(and SMC COM90c66 in '56 compatibility mode) adapters.
 # cxgb: Chelsio T3 based 1GbE/10GbE PCIe Ethernet adapters.
-# cxgbe:Chelsio T4 and T5 based 1GbE/10GbE/40GbE PCIe Ethernet adapters.
-# cxgbev: Chelsio T4 and T5 based PCIe Virtual Functions.
+# cxgbe:Chelsio T4, T5, and T6-based 1/10/25/40/100GbE PCIe Ethernet
+#	adapters.
+# cxgbev: Chelsio T4, T5, and T6-based PCIe Virtual Functions.
 # dc:   Support for PCI fast ethernet adapters based on the DEC/Intel 21143
 #       and various workalikes including:
 #       the ADMtek AL981 Comet and AN985 Centaur, the ASIX Electronics
@@ -2072,9 +2073,6 @@ device		bce		# Broadcom BCM5706/BCM5708 
 device		bfe		# Broadcom BCM440x 10/100 Ethernet
 device		bge		# Broadcom BCM570xx Gigabit Ethernet
 device		cas		# Sun Cassini/Cassini+ and NS DP83065 Saturn
-device		cxgb		# Chelsio T3 10 Gigabit Ethernet
-device		cxgb_t3fw	# Chelsio T3 10 Gigabit Ethernet firmware
-device		cxgbe		# Chelsio T4 and T5 1GbE/10GbE/40GbE
 device		dc		# DEC/Intel 21143 and various workalikes
 device		et		# Agere ET1310 10/100/Gigabit Ethernet
 device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
@@ -2105,7 +2103,10 @@ device		wb		# Winbond W89C840F
 device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 
 # PCI Ethernet NICs.
-device		cxgbev		# Chelsio T4 and T5 1GbE/10GbE/40GbE VF
+device		cxgb		# Chelsio T3 10 Gigabit Ethernet
+device		cxgb_t3fw	# Chelsio T3 10 Gigabit Ethernet firmware
+device		cxgbe		# Chelsio T4-T6 1/10/25/40/100 Gigabit Ethernet
+device		cxgbev		# Chelsio T4-T6 Virtual Functions
 device		de		# DEC/Intel DC21x4x (``Tulip'')
 device		em		# Intel Pro/1000 Gigabit Ethernet
 device		igb		# Intel Pro/1000 PCIE Gigabit Ethernet