fix compile warnings for gcc 6.2.0

[open-ath9k-htc-firmware.git] / target_firmware / wlan / ieee80211_var.h

diff --git a/target_firmware/wlan/ieee80211_var.h b/target_firmware/wlan/ieee80211_var.h
index 48f040d195ba71658e2f1213b969b250a7ea48fe..fb7423e51ce05ec1750a6a5dbb211b55179b8710 100755 (executable)
--- a/target_firmware/wlan/ieee80211_var.h
+++ b/target_firmware/wlan/ieee80211_var.h
@@ -1,3 +1,38 @@
+/*
+ * Copyright (c) 2013 Qualcomm Atheros, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted (subject to the limitations in the
+ * disclaimer below) provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *  * Neither the name of Qualcomm Atheros nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
+ * GRANTED BY THIS LICENSE.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
+ * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #ifndef _NET80211_IEEE80211_VAR_H_
 #define _NET80211_IEEE80211_VAR_H_
 
@@ -165,28 +200,6 @@ ieee80211_hdrsize(const void *data)
        return size;
 }
 
-/*
- * Return the size of the 802.11 header for a management or data frame.
- */
-static __inline a_int32_t
-ieee80211_hdrsize_padding(const void *data)
-{
-       const struct ieee80211_frame *wh = data;
-       a_int32_t size = sizeof(struct ieee80211_frame);
-       a_int32_t is4addr = (wh->i_fc[1] & IEEE80211_FC1_DIR_MASK) == IEEE80211_FC1_DIR_DSTODS;
-       a_int32_t is_qos = IEEE80211_QOS_HAS_SEQ(wh);
-
-       /* NB: we don't handle control frames */
-       adf_os_assert((wh->i_fc[0]&IEEE80211_FC0_TYPE_MASK) != IEEE80211_FC0_TYPE_CTL);
-       if (is4addr)
-               size += IEEE80211_ADDR_LEN;
-       if (is_qos)
-               size += sizeof(a_uint16_t);
-       if (is4addr && is_qos)
-               size += sizeof(a_uint16_t);
-       return size;
-}
-
 /*
  * Like ieee80211_hdrsize, but handles any type of frame.
  */
@@ -206,4 +219,9 @@ ieee80211_anyhdrsize(const void *data)
                return ieee80211_hdrsize(data);
 }
 
+a_status_t
+ieee80211_tgt_crypto_encap(struct ieee80211_frame *wh,
+                          struct ieee80211_node_target *ni,
+                          a_uint8_t keytype);
+
 #endif