Start bridge before running hostapd

server/site_linux_router.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging, re, time
 from autotest_lib.client.common_lib import error
 from autotest_lib.server import site_eap_tls
 
 def isLinuxRouter(router):
     router_uname = router.run('uname').stdout
@@ skipping 261 matching lines @@
             if conf.get('hw_mode', 'b') == 'a':
                 conf['interface'] = self.wlanif5
             else:
                 conf['interface'] = self.wlanif2
 
             # Generate hostapd.conf.
             self.router.run("cat <<EOF >%s\n%s\nEOF\n" %
                 (self.hostapd['file'], '\n'.join(
                 "%s=%s" % kv for kv in conf.iteritems())))
 
+            if not multi_interface:
+                logging.info("Initializing bridge...")
+                self.router.run("%s addbr %s" %
+                                (self.cmd_brctl, self.bridgeif))
+                self.router.run("%s setfd %s %d" %
+                                (self.cmd_brctl, self.bridgeif, 0))
+                self.router.run("%s stp %s %d" %
+                                (self.cmd_brctl, self.bridgeif, 0))
+
             # Run hostapd.
             logging.info("Starting hostapd...")
             self.router.run("%s -B %s" %
                 (self.cmd_hostapd, self.hostapd['file']))
 
 
             # Set up the bridge.
-            logging.info("Setting up the bridge...")
             if not multi_interface:
-                self.router.run("%s setfd %s %d" %
-                                (self.cmd_brctl, self.bridgeif, 0))
+                logging.info("Setting up the bridge...")
                 self.router.run("%s addif %s %s" %
                                 (self.cmd_brctl, self.bridgeif, self.wiredif))
                 self.router.run("%s link set %s up" %
                                 (self.cmd_ip, self.wiredif))
                 self.router.run("%s link set %s up" %
                                 (self.cmd_ip, self.bridgeif))
                 self.hostapd['interface'] = conf['interface']
 
             logging.info("AP configured.")
 
@@ skipping 34 matching lines @@
 
     def get_ssid(self):
         return self.hostapd['conf']['ssid']
 
 
     def set_txpower(self, params):
         self.router.run("%s dev %s set txpower %s" %
                         (self.cmd_iw, params.get('interface',
                                                  self.hostapd['interface']),
                          params.get('power', 'auto')))