Author: bschmidt
Date: Wed Apr 20 17:49:05 2011
New Revision: 220895
URL: http://svn.freebsd.org/changeset/base/220895

Log:
  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:
  head/sys/dev/iwn/if_iwn.c

Modified: head/sys/dev/iwn/if_iwn.c
==============================================================================
--- head/sys/dev/iwn/if_iwn.c   Wed Apr 20 17:43:20 2011        (r220894)
+++ head/sys/dev/iwn/if_iwn.c   Wed Apr 20 17:49:05 2011        (r220895)
@@ -78,38 +78,31 @@ 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, 0x4230, "Intel(R) Wireless WiFi Link 4965"             },
+       { 0x8086, 0x4232, "Intel(R) WiFi Link 5100"                      },
+       { 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 }
 };
 
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to