Explicitly select "HT40-" for 5GHz HT40 tests

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
 
 def isLinuxRouter(router):
     router_uname = router.run('uname').stdout
     return re.search('Linux', router_uname)
@@ skipping 237 matching lines @@
                 conf['wmm_enabled'] = 0
             elif k == 'deftxkey':
                 conf['wep_default_key'] = v
             elif k == 'ht20':
                 htcaps.add('')  # NB: ensure 802.11n setup below
                 conf['wmm_enabled'] = 1
             elif k == 'ht40':
                 htcaps.add('[HT40-]')
                 htcaps.add('[HT40+]')
                 conf['wmm_enabled'] = 1
+            elif k in ('ht40+', 'ht40-'):
+                htcaps.add('[%s]' % k.upper())
+                conf['wmm_enabled'] = 1
             elif k == 'shortgi':
                 htcaps.add('[SHORT-GI-20]')
                 htcaps.add('[SHORT-GI-40]')
             elif k == 'pureg':
                 pass        # TODO(sleffler) need hostapd support
             elif k == 'puren':
                 pass        # TODO(sleffler) need hostapd support
             elif k == 'protmode':
                 pass        # TODO(sleffler) need hostapd support
             elif k == 'ht':
@@ skipping 233 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')))