Merge "Make `wifi setclient` fast again."
diff --git a/gpio-mailbox/brcm-direct.c b/gpio-mailbox/brcm-direct.c
index 9667db1..b1e6294 100644
--- a/gpio-mailbox/brcm-direct.c
+++ b/gpio-mailbox/brcm-direct.c
@@ -390,8 +390,7 @@
   reg[0] = 0x00;
   reg[1] = 0x57;
 
-  // Default the LED brightness to 50.
-  set_pwm(&p->leds.led_brightness, 50);
+  set_pwm(&p->leds.led_brightness, 27);
 }
 
 static double get_avs_voltage_7252(struct Voltage* v) {
diff --git a/gpio-mailbox/brcm-nexus.c b/gpio-mailbox/brcm-nexus.c
index f559c1b..c53332f 100644
--- a/gpio-mailbox/brcm-nexus.c
+++ b/gpio-mailbox/brcm-nexus.c
@@ -201,8 +201,7 @@
 
   NEXUS_Pwm_CloseChannel(pwm);
 
-  // Default the LED brightness to 50.
-  set_pwm(&p->leds.led_brightness, 50);
+  set_pwm(&p->leds.led_brightness, 27);
 }
 
 void platform_cleanup() {
diff --git a/taxonomy/testdata/pcaps/HTC 10 2.4GHz GFRG210 An6.0.1 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/HTC 10 2.4GHz GFRG210 An6.0.1 Broadcast Probe.pcap
new file mode 100644
index 0000000..bdc5f7f
--- /dev/null
+++ b/taxonomy/testdata/pcaps/HTC 10 2.4GHz GFRG210 An6.0.1 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/HTC 10 2.4GHz GFRG210 An6.0.1 Specific Probe.pcap b/taxonomy/testdata/pcaps/HTC 10 2.4GHz GFRG210 An6.0.1 Specific Probe.pcap
new file mode 100644
index 0000000..964f907
--- /dev/null
+++ b/taxonomy/testdata/pcaps/HTC 10 2.4GHz GFRG210 An6.0.1 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/HTC 10 2.4GHz Google Wifi An6.0.1 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/HTC 10 2.4GHz Google Wifi An6.0.1 Broadcast Probe.pcap
new file mode 100644
index 0000000..227be7c
--- /dev/null
+++ b/taxonomy/testdata/pcaps/HTC 10 2.4GHz Google Wifi An6.0.1 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/HTC 10 2.4GHz Google Wifi An6.0.1 Specific Probe.pcap b/taxonomy/testdata/pcaps/HTC 10 2.4GHz Google Wifi An6.0.1 Specific Probe.pcap
new file mode 100644
index 0000000..8e63639
--- /dev/null
+++ b/taxonomy/testdata/pcaps/HTC 10 2.4GHz Google Wifi An6.0.1 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/HTC 10 2.4GHz OnHub An6.0.1 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/HTC 10 2.4GHz OnHub An6.0.1 Broadcast Probe.pcap
new file mode 100644
index 0000000..7db1059
--- /dev/null
+++ b/taxonomy/testdata/pcaps/HTC 10 2.4GHz OnHub An6.0.1 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/HTC 10 2.4GHz OnHub An6.0.1 Specific Probe.pcap b/taxonomy/testdata/pcaps/HTC 10 2.4GHz OnHub An6.0.1 Specific Probe.pcap
new file mode 100644
index 0000000..f332fe6
--- /dev/null
+++ b/taxonomy/testdata/pcaps/HTC 10 2.4GHz OnHub An6.0.1 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/HTC 10 5GHz GFRG210 An6.0.1 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/HTC 10 5GHz GFRG210 An6.0.1 Broadcast Probe.pcap
new file mode 100644
index 0000000..ff860eb
--- /dev/null
+++ b/taxonomy/testdata/pcaps/HTC 10 5GHz GFRG210 An6.0.1 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/HTC 10 5GHz GFRG210 An6.0.1 Specific Probe.pcap b/taxonomy/testdata/pcaps/HTC 10 5GHz GFRG210 An6.0.1 Specific Probe.pcap
new file mode 100644
index 0000000..c6d5226
--- /dev/null
+++ b/taxonomy/testdata/pcaps/HTC 10 5GHz GFRG210 An6.0.1 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/HTC 10 5GHz Google Wifi An6.0.1 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/HTC 10 5GHz Google Wifi An6.0.1 Broadcast Probe.pcap
new file mode 100644
index 0000000..9854b2f
--- /dev/null
+++ b/taxonomy/testdata/pcaps/HTC 10 5GHz Google Wifi An6.0.1 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/HTC 10 5GHz Google Wifi An6.0.1 Specific Probe.pcap b/taxonomy/testdata/pcaps/HTC 10 5GHz Google Wifi An6.0.1 Specific Probe.pcap
new file mode 100644
index 0000000..c860386
--- /dev/null
+++ b/taxonomy/testdata/pcaps/HTC 10 5GHz Google Wifi An6.0.1 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/HTC 10 5GHz OnHub An6.0.1 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/HTC 10 5GHz OnHub An6.0.1 Broadcast Probe.pcap
new file mode 100644
index 0000000..3a790d2
--- /dev/null
+++ b/taxonomy/testdata/pcaps/HTC 10 5GHz OnHub An6.0.1 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/HTC 10 5GHz OnHub An6.0.1 Specific Probe.pcap b/taxonomy/testdata/pcaps/HTC 10 5GHz OnHub An6.0.1 Specific Probe.pcap
new file mode 100644
index 0000000..373b9c5
--- /dev/null
+++ b/taxonomy/testdata/pcaps/HTC 10 5GHz OnHub An6.0.1 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G3 2.4GHz GFRG210 An5.0 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/LG G3 2.4GHz GFRG210 An5.0 Broadcast Probe.pcap
new file mode 100644
index 0000000..8187967
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G3 2.4GHz GFRG210 An5.0 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G3 2.4GHz GFRG210 An5.0 Specific Probe.pcap b/taxonomy/testdata/pcaps/LG G3 2.4GHz GFRG210 An5.0 Specific Probe.pcap
new file mode 100644
index 0000000..1d6a069
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G3 2.4GHz GFRG210 An5.0 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G3 2.4GHz Google Wifi An5.0 Specific Probe.pcap b/taxonomy/testdata/pcaps/LG G3 2.4GHz Google Wifi An5.0 Specific Probe.pcap
new file mode 100644
index 0000000..1c77515
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G3 2.4GHz Google Wifi An5.0 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G3 2.4GHz OnHub An5.0 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/LG G3 2.4GHz OnHub An5.0 Broadcast Probe.pcap
new file mode 100644
index 0000000..c89b89b
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G3 2.4GHz OnHub An5.0 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G3 2.4GHz OnHub An5.0 Specific Probe.pcap b/taxonomy/testdata/pcaps/LG G3 2.4GHz OnHub An5.0 Specific Probe.pcap
new file mode 100644
index 0000000..a459348
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G3 2.4GHz OnHub An5.0 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G3 2.4GHz.pcap b/taxonomy/testdata/pcaps/LG G3 2.4GHz.pcap
deleted file mode 100644
index 19002cf..0000000
--- a/taxonomy/testdata/pcaps/LG G3 2.4GHz.pcap
+++ /dev/null
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G3 5GHz GFRG210 An5.0 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/LG G3 5GHz GFRG210 An5.0 Broadcast Probe.pcap
new file mode 100644
index 0000000..d3d38d4
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G3 5GHz GFRG210 An5.0 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G3 5GHz GFRG210 An5.0 Specific Probe.pcap b/taxonomy/testdata/pcaps/LG G3 5GHz GFRG210 An5.0 Specific Probe.pcap
new file mode 100644
index 0000000..49943f1
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G3 5GHz GFRG210 An5.0 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G3 5GHz Google Wifi An5.0 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/LG G3 5GHz Google Wifi An5.0 Broadcast Probe.pcap
new file mode 100644
index 0000000..aebde75
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G3 5GHz Google Wifi An5.0 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G3 5GHz Google Wifi An5.0 Specific Probe.pcap b/taxonomy/testdata/pcaps/LG G3 5GHz Google Wifi An5.0 Specific Probe.pcap
new file mode 100644
index 0000000..6ee379c
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G3 5GHz Google Wifi An5.0 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G3 5GHz OnHub An5.0 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/LG G3 5GHz OnHub An5.0 Broadcast Probe.pcap
new file mode 100644
index 0000000..cbf3ba2
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G3 5GHz OnHub An5.0 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G3 5GHz OnHub An5.0 Specific Probe.pcap b/taxonomy/testdata/pcaps/LG G3 5GHz OnHub An5.0 Specific Probe.pcap
new file mode 100644
index 0000000..76816e1
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G3 5GHz OnHub An5.0 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G5 2.4GHz GFRG210 An6.0.1 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/LG G5 2.4GHz GFRG210 An6.0.1 Broadcast Probe.pcap
new file mode 100644
index 0000000..6412a6d
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G5 2.4GHz GFRG210 An6.0.1 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G5 2.4GHz GFRG210 An6.0.1 Specific Probe.pcap b/taxonomy/testdata/pcaps/LG G5 2.4GHz GFRG210 An6.0.1 Specific Probe.pcap
new file mode 100644
index 0000000..025eb08
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G5 2.4GHz GFRG210 An6.0.1 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G5 2.4GHz Google Wifi An6.0.1 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/LG G5 2.4GHz Google Wifi An6.0.1 Broadcast Probe.pcap
new file mode 100644
index 0000000..d748338
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G5 2.4GHz Google Wifi An6.0.1 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G5 2.4GHz Google Wifi An6.0.1 Specific Probe.pcap b/taxonomy/testdata/pcaps/LG G5 2.4GHz Google Wifi An6.0.1 Specific Probe.pcap
new file mode 100644
index 0000000..e9c4275
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G5 2.4GHz Google Wifi An6.0.1 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G5 2.4GHz OnHub An6.0.1 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/LG G5 2.4GHz OnHub An6.0.1 Broadcast Probe.pcap
new file mode 100644
index 0000000..f3662ce
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G5 2.4GHz OnHub An6.0.1 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G5 5GHz GFRG210 An6.0.1 Specific Probe.pcap b/taxonomy/testdata/pcaps/LG G5 5GHz GFRG210 An6.0.1 Specific Probe.pcap
new file mode 100644
index 0000000..2973914
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G5 5GHz GFRG210 An6.0.1 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G5 5GHz Google Wifi An6.0.1 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/LG G5 5GHz Google Wifi An6.0.1 Broadcast Probe.pcap
new file mode 100644
index 0000000..269c3f9
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G5 5GHz Google Wifi An6.0.1 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G5 5GHz Google Wifi An6.0.1 Specific Probe.pcap b/taxonomy/testdata/pcaps/LG G5 5GHz Google Wifi An6.0.1 Specific Probe.pcap
new file mode 100644
index 0000000..207fb20
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G5 5GHz Google Wifi An6.0.1 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G5 5GHz OnHub An6.0.1 Broadcast Probe.pcap b/taxonomy/testdata/pcaps/LG G5 5GHz OnHub An6.0.1 Broadcast Probe.pcap
new file mode 100644
index 0000000..4650b18
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G5 5GHz OnHub An6.0.1 Broadcast Probe.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G5 5GHz OnHub An6.0.1 Specific Probe.pcap b/taxonomy/testdata/pcaps/LG G5 5GHz OnHub An6.0.1 Specific Probe.pcap
new file mode 100644
index 0000000..577523c
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G5 5GHz OnHub An6.0.1 Specific Probe.pcap
Binary files differ
diff --git a/taxonomy/wifi.py b/taxonomy/wifi.py
index 4057db6..1d7e200 100644
--- a/taxonomy/wifi.py
+++ b/taxonomy/wifi.py
@@ -40,7 +40,7 @@
     'wifi4|probe:0,1,50,127,107,221(0050f2,4),221(506f9a,9),221(506f9a,16),extcap:00000080,wps:5042T|assoc:0,1,50,45,48,127,221(0050f2,2),htcap:1172,htagg:03,htmcs:000000ff,extcap:01':
         ('Alcatel OneTouch', 'Pop Astro', '2.4GHz'),
 
-    'wifi4|probe:0,1,50,45,3,221(001018,2),221(00904c,51),htcap:110c,htagg:19,htmcs:000000ff|assoc:0,1,48,50,45,221(001018,2),221(00904c,51),221(0050f2,2),htcap:110c,htagg:19,htmcs:000000ff|os:dashbutton':
+    'wifi4|probe:0,1,50,45,3,221(001018,2),221(00904c,51),htcap:110c,htagg:19,htmcs:000000ff|assoc:0,1,48,50,45,221(001018,2),221(00904c,51),221(0050f2,2),htcap:110c,htagg:19,htmcs:000000ff|oui:amazon':
         ('Amazon Dash Button', '', '2.4GHz'),
 
     'wifi4|probe:0,1,3,45,221(0050f2,8),191,htcap:016e,htagg:03,htmcs:000000ff,vhtcap:31805120,vhtrxmcs:0000fffe,vhttxmcs:0000fffe|assoc:0,1,48,45,221(0050f2,2),191,127,htcap:016e,htagg:03,htmcs:000000ff,vhtcap:31805120,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,extcap:00000a0200000040|oui:amazon':
@@ -292,6 +292,25 @@
     'wifi4|probe:0,1,50,45,htcap:0130,htagg:18,htmcs:000000ff|assoc:0,1,50,48,45,221(0050f2,2),htcap:013c,htagg:18,htmcs:000000ff|oui:htc':
         ('HTC One', 'X', '2.4GHz'),
 
+    'wifi4|probe:0,1,45,127,107,191,221(0050f2,4),221(506f9a,9),221(506f9a,16),221(0050f2,8),221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:00080f840140,wps:HTC_M10h|assoc:0,1,33,36,48,45,127,191,221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1102,extcap:000008':
+        ('HTC 10', '', '5GHz'),
+    'wifi4|probe:0,1,45,127,107,191,221(0050f2,4),221(506f9a,9),221(506f9a,16),221(0050f2,8),221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9178b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:00080f840140,wps:HTC_M10h|assoc:0,1,33,36,48,70,45,191,221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1102':
+        ('HTC 10', '', '5GHz'),
+    'wifi4|probe:0,1,45,127,107,191,221(0050f2,4),221(506f9a,9),221(506f9a,16),221(0050f2,8),221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:00080f840140,wps:HTC_M10h|assoc:0,1,33,36,48,70,45,191,221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1102':
+        ('HTC 10', '', '5GHz'),
+    'wifi4|probe:0,1,45,127,107,191,221(0050f2,4),221(506f9a,9),221(506f9a,16),221(0050f2,8),221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9178b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:00080f840140,wps:HTC_M10h|assoc:0,1,33,36,48,45,127,191,221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9138b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1102,extcap:000008':
+        ('HTC 10', '', '5GHz'),
+    'wifi4|probe:0,1,45,127,107,191,221(0050f2,4),221(506f9a,9),221(506f9a,16),221(0050f2,8),221(001018,2),htcap:0163,htagg:17,htmcs:0000ffff,vhtcap:0f901032,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:00080f840140,wps:HTC_M10h|assoc:0,1,33,36,48,45,127,191,221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9138b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1102,extcap:000008':
+        ('HTC 10', '', '5GHz'),
+    'wifi4|probe:0,1,45,127,107,191,221(0050f2,4),221(506f9a,9),221(506f9a,16),221(0050f2,8),221(001018,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9178b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,extcap:00080f840140,wps:HTC_M10h|assoc:0,1,33,36,48,45,127,191,221(001018,2),221(0050f2,2),htcap:01ef,htagg:17,htmcs:0000ffff,vhtcap:0f9118b2,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:1102,extcap:000008':
+        ('HTC 10', '', '5GHz'),
+    'wifi4|probe:0,1,50,3,45,127,107,221(0050f2,4),221(506f9a,9),221(506f9a,16),221(0050f2,8),221(001018,2),htcap:11ef,htagg:17,htmcs:0000ffff,extcap:00080f8401400040,wps:HTC_M10h|assoc:0,1,50,33,36,48,70,45,221(001018,2),221(0050f2,2),htcap:11ef,htagg:17,htmcs:0000ffff,txpow:1302':
+        ('HTC 10', '', '2.4GHz'),
+    'wifi4|probe:0,1,50,3,45,127,107,221(0050f2,4),221(506f9a,9),221(506f9a,16),221(0050f2,8),221(001018,2),htcap:11ef,htagg:17,htmcs:0000ffff,extcap:00080f840140,wps:HTC_M10h|assoc:0,1,50,33,36,48,45,127,221(001018,2),221(0050f2,2),htcap:11ef,htagg:17,htmcs:0000ffff,txpow:1302,extcap:000008':
+        ('HTC 10', '', '2.4GHz'),
+    'wifi4|probe:0,1,50,3,45,127,107,221(0050f2,4),221(506f9a,9),221(506f9a,16),221(0050f2,8),221(001018,2),htcap:11ef,htagg:17,htmcs:0000ffff,extcap:00080f840140,wps:HTC_M10h|assoc:0,1,50,33,36,48,70,45,221(001018,2),221(0050f2,2),htcap:11ef,htagg:17,htmcs:0000ffff,txpow:1302':
+        ('HTC 10', '', '2.4GHz'),
+
     'wifi4|probe:0,1,45,221(001018,2),221(00904c,51),htcap:080c,htagg:1b,htmcs:000000ff|assoc:0,1,33,36,48,45,221(001018,2),221(00904c,51),221(0050f2,2),htcap:080c,htagg:1b,htmcs:000000ff,txpow:1008|os:ios':
         ('iPad', '1st or 2nd gen', '5GHz'),
     'wifi4|probe:0,1,45,221(001018,2),htcap:080c,htagg:1b,htmcs:000000ff|assoc:0,1,33,36,48,45,221(001018,2),221(00904c,51),htcap:080c,htagg:1b,htmcs:000000ff,txpow:1008|os:ios':
@@ -689,18 +708,35 @@
         ('LG G3', '', '5GHz'),
     'wifi4|probe:0,1,45,221(0050f2,8),191,127,107,221(506f9a,16),htcap:016e,htagg:03,htmcs:000000ff,vhtcap:31805120,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,extcap:000000800040|assoc:0,1,33,36,48,45,221(0050f2,2),191,127,htcap:016e,htagg:03,htmcs:000000ff,vhtcap:31805120,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,txpow:170d,extcap:00000a8201400040|oui:lg':
         ('LG G3', '', '5GHz'),
+    'wifi4|probe:0,1,45,221(0050f2,8),191,htcap:016e,htagg:03,htmcs:000000ff,vhtcap:31805120,vhtrxmcs:0000fffe,vhttxmcs:0000fffe|assoc:0,1,33,36,48,45,221(0050f2,2),191,127,htcap:016e,htagg:03,htmcs:000000ff,vhtcap:31805120,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,txpow:170d,extcap:00000a8201400040|oui:lg':
+        ('LG G3', '', '5GHz'),
+    'wifi4|probe:0,1,45,221(0050f2,8),191,htcap:016e,htagg:03,htmcs:000000ff,vhtcap:31805120,vhtrxmcs:0000fffe,vhttxmcs:0000fffe|assoc:0,1,48,45,221(0050f2,2),191,127,htcap:016e,htagg:03,htmcs:000000ff,vhtcap:31805120,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,extcap:00000a8201400040|oui:lg':
+        ('LG G3', '', '5GHz'),
+    'wifi4|probe:0,1,45,221(0050f2,8),191,127,107,221(506f9a,16),htcap:016e,htagg:03,htmcs:000000ff,vhtcap:31805120,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,extcap:000000800040|assoc:0,1,48,45,221(0050f2,2),191,127,htcap:016e,htagg:03,htmcs:000000ff,vhtcap:31805120,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,extcap:00000a8201400040|oui:lg':
+        ('LG G3', '', '5GHz'),
     'wifi4|probe:0,1,50,3,45,221(0050f2,8),127,107,221(506f9a,16),htcap:012c,htagg:03,htmcs:000000ff,extcap:000000800040|assoc:0,1,50,48,45,221(0050f2,2),127,htcap:012c,htagg:03,htmcs:000000ff,extcap:00000a8201400000|oui:lg':
         ('LG G3', '', '2.4GHz'),
     'wifi4|probe:0,1,50,3,45,221(0050f2,8),127,107,221(506f9a,16),htcap:012c,htagg:03,htmcs:000000ff,extcap:000000800040|assoc:0,1,50,33,48,70,45,221(0050f2,2),127,htcap:012c,htagg:03,htmcs:000000ff,txpow:170d,extcap:00000a8201400000|oui:lg':
         ('LG G3', '', '2.4GHz'),
     'wifi4|probe:0,1,50,3,45,221(0050f2,8),127,107,221(506f9a,16),htcap:016e,htagg:03,htmcs:000000ff,extcap:000000800040|assoc:0,1,50,33,48,70,45,221(0050f2,2),127,htcap:012c,htagg:03,htmcs:000000ff,txpow:170d,extcap:00000a8201400000|oui:lg':
         ('LG G3', '', '2.4GHz'),
+    'wifi4|probe:0,1,50,3,45,221(0050f2,8),htcap:012c,htagg:03,htmcs:000000ff|assoc:0,1,50,48,45,221(0050f2,2),127,htcap:012c,htagg:03,htmcs:000000ff,extcap:00000a8201400000|oui:lg':
+        ('LG G3', '', '2.4GHz'),
 
     'wifi4|probe:0,1,3,45,127,107,191,221(506f9a,16),221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:016f,htagg:17,htmcs:000000ff,vhtcap:0f805932,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,extcap:0000088001400040|assoc:0,1,33,36,48,45,127,191,221(001018,2),221(00904c,4),221(0050f2,2),htcap:016f,htagg:17,htmcs:000000ff,vhtcap:0f805932,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,txpow:1d01,extcap:0000008001400040|oui:lg':
         ('LG G4', '', '5GHz'),
     'wifi4|probe:0,1,50,45,127,107,221(506f9a,16),221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:112d,htagg:17,htmcs:000000ff,extcap:0000088001400040|assoc:0,1,33,36,48,50,45,127,221(001018,2),221(0050f2,2),htcap:112d,htagg:17,htmcs:000000ff,txpow:1001,extcap:000000800140|oui:lg':
         ('LG G4', '', '2.4GHz'),
 
+    'wifi4|probe:0,1,45,127,107,191,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:0063,htagg:17,htmcs:000000ff,vhtcap:0f805032,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,extcap:0000088001400040|assoc:0,1,33,36,48,45,127,191,221(00904c,4),221(001632,64),221(001018,2),221(0050f2,2),htcap:0063,htagg:17,htmcs:000000ff,vhtcap:0f805032,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,txpow:e003,extcap:0000080000000040|oui:lg':
+        ('LG G5', '', '5GHz'),
+    'wifi4|probe:0,1,45,127,107,191,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:0063,htagg:17,htmcs:000000ff,vhtcap:0f805032,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,extcap:0000088001400040|assoc:0,1,33,36,48,70,45,127,191,221(00904c,4),221(001632,64),221(001018,2),221(0050f2,2),htcap:0063,htagg:17,htmcs:000000ff,vhtcap:0f805032,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,txpow:e003,extcap:0000000000000040|oui:lg':
+        ('LG G5', '', '5GHz'),
+    'wifi4|probe:0,1,50,3,45,127,107,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:0021,htagg:17,htmcs:000000ff,extcap:0000088001400040|assoc:0,1,50,33,36,48,45,127,221(00904c,4),221(001632,64),221(001018,2),221(0050f2,2),htcap:0021,htagg:17,htmcs:000000ff,txpow:0f03,extcap:0000080000000040|oui:lg':
+        ('LG G5', '', '2.4GHz'),
+    'wifi4|probe:0,1,50,3,45,127,107,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:0021,htagg:17,htmcs:000000ff,extcap:0000088001400040|assoc:0,1,50,33,36,48,70,45,127,221(001632,64),221(001018,2),221(0050f2,2),htcap:0021,htagg:17,htmcs:000000ff,txpow:0f03,extcap:0000000000000040|oui:lg':
+        ('LG G5', '', '2.4GHz'),
+
     'wifi4|probe:0,1,50,3,45,221(0050f2,8),221(0050f2,4),221(506f9a,9),htcap:012c,htagg:03,htmcs:000000ff,wps:LGL16C|assoc:0,1,50,48,45,221(0050f2,2),htcap:012c,htagg:03,htmcs:000000ff':
         ('LG Lucky', '', '2.4GHz'),
 
diff --git a/wifi/quantenna.py b/wifi/quantenna.py
index 9e0d26b..3e6445f 100755
--- a/wifi/quantenna.py
+++ b/wifi/quantenna.py
@@ -58,11 +58,8 @@
 def _parse_scan_result(line):
   # Scan result format:
   #
-  # "Quantenna1" 00:26:86:00:11:5f 60 56 1 2 1 2 0 15 80 100 1 Infrastructure
-  # |            |                 |  |  | | | | | |  |  |   | |
-  # |            |                 |  |  | | | | | |  |  |   | Mode
-  # |            |                 |  |  | | | | | |  |  |   DTIM interval
-  # |            |                 |  |  | | | | | |  |  Beacon interval
+  # "Quantenna1" 00:26:86:00:11:5f 60 56 1 2 1 2 0 15 80
+  # |            |                 |  |  | | | | | |  |
   # |            |                 |  |  | | | | | |  Maximum bandwidth
   # |            |                 |  |  | | | | | WPS flags
   # |            |                 |  |  | | | | Qhop flags
@@ -77,7 +74,7 @@
   #
   # The SSID may contain quotes and spaces. Split on whitespace from the right,
   # making at most 10 splits, to preserve spaces in the SSID.
-  sp = line.strip().rsplit(None, 13)
+  sp = line.strip().rsplit(None, 10)
   return sp[0][1:-1], sp[1], int(sp[2]), -float(sp[3]), int(sp[4]), int(sp[5])
 
 
diff --git a/wifi/quantenna_test.py b/wifi/quantenna_test.py
index 00400ed..beef431 100755
--- a/wifi/quantenna_test.py
+++ b/wifi/quantenna_test.py
@@ -33,8 +33,7 @@
 
 @wvtest.wvtest
 def parse_scan_result_test():
-  result = ('  " ssid with "quotes" " 00:11:22:33:44:55 40 25 0 0 0 0 0 1 40 '
-            '100 1 Infrastructure')
+  result = '  " ssid with "quotes" " 00:11:22:33:44:55 40 25 0 0 0 0 0 1 40  '
   wvtest.WVPASSEQ(quantenna._parse_scan_result(result),
                   (' ssid with "quotes" ', '00:11:22:33:44:55', 40, -25, 0, 0))