commit 31b95158dd512bd86119789211e72a662d21c310
author Aaron Germuth <germuth@google.com> Fri Dec 02 23:34:22 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 02 23:34:22 2016 +0000
tree bad90f208465f6c7b9a7a6331fa9274ca38456f2
parent c685ef28fef4df764698c9099ea7f079136f00ab
parent 991bbf1b0c9063b5e5704822cd7d3568e650c2ce

Merge "gpio-mailbox: Add gflt400 entry"

conman/interface.py

diff --git a/conman/interface.py b/conman/interface.py
index 1de5a59..245ca27 100755
--- a/conman/interface.py
+++ b/conman/interface.py
@@ -459,7 +459,6 @@
       k, v = line.strip().split('=', 1)
       status[k] = v
 
-    self.logger.debug('wpa_status is %r', status)
     return status
 
   def update(self):

wifi/configs.py

diff --git a/wifi/configs.py b/wifi/configs.py
index a4f20b8..572b1c9 100644
--- a/wifi/configs.py
+++ b/wifi/configs.py
@@ -370,14 +370,15 @@
   else:
     network_block_lines = wpa_network_lines(ssid, passphrase)
 
+  freq_list = ' '.join(autochannel.get_all_frequencies(opt.band))
+
   network_block_lines.append('\tscan_ssid=1')
   if opt.bssid:
     network_block_lines.append('\tbssid=%s' %
                                utils.validate_and_sanitize_bssid(opt.bssid))
+  network_block_lines.append('\tfreq_list=' + freq_list)
   network_block = make_network_block(network_block_lines)
 
-  freq_list = ' '.join(autochannel.get_all_frequencies(opt.band))
-
   lines = [
       'ctrl_interface=/var/run/wpa_supplicant',
       'ap_scan=1',

wifi/configs_test.py

diff --git a/wifi/configs_test.py b/wifi/configs_test.py
index 016fc27..bd28626 100755
--- a/wifi/configs_test.py
+++ b/wifi/configs_test.py
@@ -26,6 +26,7 @@
 \t#psk="some passphrase"
 \tpsk=41821f7ca3ea5d85beea7644ed7e0fefebd654177fa06c26fbdfdc3c599a317f
 \tscan_ssid=1
+\tfreq_list={freq_list}
 }}
 """
 
@@ -39,6 +40,7 @@
 \tpsk=41821f7ca3ea5d85beea7644ed7e0fefebd654177fa06c26fbdfdc3c599a317f
 \tscan_ssid=1
 \tbssid=12:34:56:78:90:ab
+\tfreq_list={freq_list}
 }}
 """
 
@@ -53,6 +55,7 @@
 \tkey_mgmt=NONE
 \tscan_ssid=1
 \tbssid=12:34:56:78:90:ab
+\tfreq_list={freq_list}
 }}
 """