ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/os/linux/include/ieee80211_ioctl.h

Index: chromeos/drivers/ath6kl/os/linux/include/ieee80211_ioctl.h
diff --git a/chromeos/drivers/ath6kl/os/linux/include/ieee80211_ioctl.h b/chromeos/drivers/ath6kl/os/linux/include/ieee80211_ioctl.h
index 29c68886d92ee5be4d30cc1b5b0acbfef8766904..769a48014313f6d0c185bb21b61c4e37245d92be 100644
--- a/chromeos/drivers/ath6kl/os/linux/include/ieee80211_ioctl.h
+++ b/chromeos/drivers/ath6kl/os/linux/include/ieee80211_ioctl.h
@@ -1,20 +1,25 @@
-/*
- * Copyright (c) 2004-2005 Atheros Communications Inc.
- * 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;
+//------------------------------------------------------------------------------
+// Copyright (c) 2004-2010 Atheros Communications Inc.
+// All rights reserved.
 //
-// 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 _IEEE80211_IOCTL_H_
 #define _IEEE80211_IOCTL_H_
@@ -163,7 +168,7 @@ struct ieee80211req_wpaie {
     u_int8_t    rsn_ie[IEEE80211_MAX_IE];
 };
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
+#ifndef IW_ENCODE_ALG_PMK
 #define IW_ENCODE_ALG_PMK       4
 #endif