ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/include/common/discovery.h

 //------------------------------------------------------------------------------
 // <copyright file="discovery.h" company="Atheros">
-//    Copyright (c) 2004-2007 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.
 //
 //
 //------------------------------------------------------------------------------
 //==============================================================================
 // Author(s): ="Atheros"
 //==============================================================================
 
 #ifndef _DISCOVERY_H_
 #define _DISCOVERY_H_
 
@@ skipping 39 matching lines @@
 typedef enum {
     DC_IGNORE_WPAx_GROUP_CIPHER = 0x01,
     DC_PROFILE_MATCH_DONE = 0x02,
     DC_IGNORE_AAC_BEACON = 0x04, 
     DC_CSA_FOLLOW_BSS = 0x08,
 } DC_PROFILE_FILTER;
 
 #define DEFAULT_DC_PROFILE_FILTER   (DC_CSA_FOLLOW_BSS)
 
 #endif  /* _DISCOVERY_H_ */