ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/miscdrv/ar3kconfig.c

Index: chromeos/drivers/ath6kl/miscdrv/ar3kconfig.c
diff --git a/chromeos/drivers/ath6kl/miscdrv/ar3kconfig.c b/chromeos/drivers/ath6kl/miscdrv/ar3kconfig.c
index 4b95f0f16e5afe69ef855e17a70d40f59f1d1554..83bc5be3ef1bcdbb660a4e63d3c1390e8c97860f 100644
--- a/chromeos/drivers/ath6kl/miscdrv/ar3kconfig.c
+++ b/chromeos/drivers/ath6kl/miscdrv/ar3kconfig.c
@@ -1,15 +1,18 @@
 //------------------------------------------------------------------------------
-// <copyright file="ar3kconfig.c" company="Atheros">
-//    Copyright (c) 2009 Atheros Corporation.  All rights reserved.
+// Copyright (c) 2009-2010 Atheros Corporation.  All rights reserved.
 // 
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation;
 //
-// Software distributed under the License is distributed on an "AS
-// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-// implied. See the License for the specific language governing
-// rights and limitations under the License.
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 //
 //------------------------------------------------------------------------------
@@ -476,14 +479,7 @@ A_STATUS AR3KConfigure(AR3K_CONFIG_INFO *pConfig)
             }    
         }
         
-        if (pConfig->Flags & 
-                (AR3K_CONFIG_FLAG_SET_AR3K_BAUD | AR3K_CONFIG_FLAG_SET_AR6K_SCALE_STEP)) {
-            status = AR3KConfigureHCIBaud(pConfig);      
-            if (A_FAILED(status)) {
-                break;    
-            }
-        }
-
+       
         /* Load patching and PST file if available*/
         if (A_OK != AthPSInitialize(pConfig)) {
             AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Patch Download Failed!\n"));
@@ -492,6 +488,16 @@ A_STATUS AR3KConfigure(AR3K_CONFIG_INFO *pConfig)
         /* Send HCI reset to make PS tags take effect*/
         AR3KConfigureSendHCIReset(pConfig);
 
+ 	if (pConfig->Flags & 
+                (AR3K_CONFIG_FLAG_SET_AR3K_BAUD | AR3K_CONFIG_FLAG_SET_AR6K_SCALE_STEP)) {
+            status = AR3KConfigureHCIBaud(pConfig);      
+            if (A_FAILED(status)) {
+                break;    
+            }
+        }     
+
+
+
         if (pConfig->PwrMgmtEnabled) {
             /* the delay is required after the previous HCI reset before further
              * HCI commands can be issued