svn commit: r223257 - stable/8/sys/dev/iwn

[Bernhard Schmidt]

Author: bschmidt
Date: Sat Jun 18 12:32:48 2011
New Revision: 223257
URL: http://svn.freebsd.org/changeset/base/223257

Log:
  MFC r220895,221634:
  Now that all bits are in for 1030/6230 adapters enable those.
  While here pull the adapter names from the Linux driver and sort
  the list by ID.

Modified:
  stable/8/sys/dev/iwn/if_iwn.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/dev/iwn/if_iwn.c
==============================================================================
--- stable/8/sys/dev/iwn/if_iwn.c	Sat Jun 18 12:30:33 2011	(r223256)
+++ stable/8/sys/dev/iwn/if_iwn.c	Sat Jun 18 12:32:48 2011	(r223257)
@@ -78,38 +78,33 @@ struct iwn_ident {
 	const char	*name;
 };
 
-static const struct iwn_ident iwn_ident_table [] = {
-	{ 0x8086, 0x4229, "Intel(R) PRO/Wireless 4965BGN" },
-	{ 0x8086, 0x422D, "Intel(R) PRO/Wireless 4965BGN" },
-	{ 0x8086, 0x4230, "Intel(R) PRO/Wireless 4965BGN" },
-	{ 0x8086, 0x4233, "Intel(R) PRO/Wireless 4965BGN" },
-	{ 0x8086, 0x4232, "Intel(R) PRO/Wireless 5100" },
-	{ 0x8086, 0x4237, "Intel(R) PRO/Wireless 5100" },
-	{ 0x8086, 0x423C, "Intel(R) PRO/Wireless 5150" },
-	{ 0x8086, 0x423D, "Intel(R) PRO/Wireless 5150" },
-	{ 0x8086, 0x4235, "Intel(R) PRO/Wireless 5300" },
-	{ 0x8086, 0x4236, "Intel(R) PRO/Wireless 5300" },
-	{ 0x8086, 0x423A, "Intel(R) PRO/Wireless 5350" },
-	{ 0x8086, 0x423B, "Intel(R) PRO/Wireless 5350" },
-	{ 0x8086, 0x0083, "Intel(R) PRO/Wireless 1000" },
-	{ 0x8086, 0x0084, "Intel(R) PRO/Wireless 1000" },
-	{ 0x8086, 0x008D, "Intel(R) PRO/Wireless 6000" },
-	{ 0x8086, 0x008E, "Intel(R) PRO/Wireless 6000" },
-	{ 0x8086, 0x4238, "Intel(R) PRO/Wireless 6000" },
-	{ 0x8086, 0x4239, "Intel(R) PRO/Wireless 6000" },
-	{ 0x8086, 0x422B, "Intel(R) PRO/Wireless 6000" },
-	{ 0x8086, 0x422C, "Intel(R) PRO/Wireless 6000" },
-	{ 0x8086, 0x0087, "Intel(R) PRO/Wireless 6250" },
-	{ 0x8086, 0x0089, "Intel(R) PRO/Wireless 6250" },
-	{ 0x8086, 0x0082, "Intel(R) PRO/Wireless 6205a" },
-	{ 0x8086, 0x0085, "Intel(R) PRO/Wireless 6205a" },
-#ifdef notyet
-	{ 0x8086, 0x008a, "Intel(R) PRO/Wireless 6205b" },
-	{ 0x8086, 0x008b, "Intel(R) PRO/Wireless 6205b" },
-	{ 0x8086, 0x008f, "Intel(R) PRO/Wireless 6205b" },
-	{ 0x8086, 0x0090, "Intel(R) PRO/Wireless 6205b" },
-	{ 0x8086, 0x0091, "Intel(R) PRO/Wireless 6205b" },
-#endif
+static const struct iwn_ident iwn_ident_table[] = {
+	{ 0x8086, 0x0082, "Intel(R) Centrino(R) Advanced-N 6205"	 },
+	{ 0x8086, 0x0083, "Intel(R) Centrino(R) Wireless-N 1000"	 },
+	{ 0x8086, 0x0084, "Intel(R) Centrino(R) Wireless-N 1000"	 },
+	{ 0x8086, 0x0085, "Intel(R) Centrino(R) Advanced-N 6205"	 },
+	{ 0x8086, 0x0087, "Intel(R) Centrino(R) Advanced-N + WiMAX 6250" },
+	{ 0x8086, 0x0089, "Intel(R) Centrino(R) Advanced-N + WiMAX 6250" },
+	{ 0x8086, 0x008a, "Intel(R) Centrino(R) Wireless-N 1030"	 },
+	{ 0x8086, 0x008b, "Intel(R) Centrino(R) Wireless-N 1030"	 },
+	{ 0x8086, 0x0090, "Intel(R) Centrino(R) Advanced-N 6230"	 },
+	{ 0x8086, 0x0091, "Intel(R) Centrino(R) Advanced-N 6230"	 },
+	{ 0x8086, 0x4229, "Intel(R) Wireless WiFi Link 4965"		 },
+	{ 0x8086, 0x422b, "Intel(R) Centrino(R) Ultimate-N 6300"	 },
+	{ 0x8086, 0x422c, "Intel(R) Centrino(R) Advanced-N 6200"	 },
+	{ 0x8086, 0x422d, "Intel(R) Wireless WiFi Link 4965"		 },
+	{ 0x8086, 0x4230, "Intel(R) Wireless WiFi Link 4965"		 },
+	{ 0x8086, 0x4232, "Intel(R) WiFi Link 5100"			 },
+	{ 0x8086, 0x4233, "Intel(R) Wireless WiFi Link 4965"		 },
+	{ 0x8086, 0x4235, "Intel(R) Ultimate N WiFi Link 5300"		 },
+	{ 0x8086, 0x4236, "Intel(R) Ultimate N WiFi Link 5300"		 },
+	{ 0x8086, 0x4237, "Intel(R) WiFi Link 5100"			 },
+	{ 0x8086, 0x4238, "Intel(R) Centrino(R) Ultimate-N 6300"	 },
+	{ 0x8086, 0x4239, "Intel(R) Centrino(R) Advanced-N 6200"	 },
+	{ 0x8086, 0x423a, "Intel(R) WiMAX/WiFi Link 5350"		 },
+	{ 0x8086, 0x423b, "Intel(R) WiMAX/WiFi Link 5350"		 },
+	{ 0x8086, 0x423c, "Intel(R) WiMAX/WiFi Link 5150"		 },
+	{ 0x8086, 0x423d, "Intel(R) WiMAX/WiFi Link 5150"		 },
 	{ 0, 0, NULL }
 };