ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/wlan/include/ieee80211_node.h

Index: chromeos/drivers/ath6kl/wlan/include/ieee80211_node.h
diff --git a/chromeos/drivers/ath6kl/wlan/include/ieee80211_node.h b/chromeos/drivers/ath6kl/wlan/include/ieee80211_node.h
index faa1d653509ef5bb20e7974e0bec70055ef8eeb6..683deec87b2d48f70a86700fb3f49d1ccdccb357 100644
--- a/chromeos/drivers/ath6kl/wlan/include/ieee80211_node.h
+++ b/chromeos/drivers/ath6kl/wlan/include/ieee80211_node.h
@@ -1,15 +1,19 @@
 //------------------------------------------------------------------------------
 // <copyright file="ieee80211_node.h" company="Atheros">
-//    Copyright (c) 2004-2008 Atheros Corporation.  All rights reserved.
+//    Copyright (c) 2004-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.
 //
 //
 //------------------------------------------------------------------------------
@@ -68,14 +72,22 @@ struct ieee80211_node_table {
     struct bss              *nt_hash[IEEE80211_NODE_HASHSIZE];
     const char              *nt_name;   /* for debugging */
     A_UINT32                nt_scangen; /* gen# for timeout scan */
+#ifdef THREAD_X
     A_TIMER                 nt_inact_timer;
     A_UINT8                 isTimerArmed;   /* is the node timer armed */
+#endif
     A_UINT32                nt_nodeAge; /* node aging time */
 #ifdef OS_ROAM_MANAGEMENT
     A_UINT32                nt_si_gen; /* gen# for scan indication*/
 #endif
 };
 
+#ifdef THREAD_X
+#define WLAN_NODE_INACT_TIMEOUT_MSEC            20000
+#else
 #define WLAN_NODE_INACT_TIMEOUT_MSEC            120000
+#endif
+   
+#define WLAN_NODE_INACT_CNT            4
 
 #endif /* _IEEE80211_NODE_H_ */