X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fieee80211_output.c;h=1230e2c703ba29795e53f06e6fe799ecbd630e4f;hb=5795da258fd20dac0f5a49a58fd4ea62c61cb237;hp=43bfeda39698c93b5338872033c66419cd447b8d;hpb=8804cc94e3b66550797279f540b960d18a78421f;p=open-ath9k-htc-firmware.git

diff --git a/target_firmware/wlan/ieee80211_output.c b/target_firmware/wlan/ieee80211_output.c
index 43bfeda..1230e2c 100755
--- a/target_firmware/wlan/ieee80211_output.c
+++ b/target_firmware/wlan/ieee80211_output.c
@@ -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.
+ */
+
 #include <adf_os_types.h>
 #include <adf_os_dma.h>
 #include <adf_os_timer.h>
@@ -13,10 +48,8 @@
 #include <adf_net.h>
 
 #include <if_llc.h>
-#include <if_ethersubr.h>
 #include "ieee80211_var.h"
 
-#include "_ieee80211.h"
 #include "ieee80211.h"
 #include <wlan_hdr.h>
 
@@ -34,10 +67,16 @@ ieee80211_tgt_crypto_encap(struct ieee80211_frame *wh,
 	a_uint16_t tmp;
 	a_uint16_t offset = IEEE80211_WLAN_HDR_LEN;
 	a_uint8_t b1, b2;
+	struct ieee80211_qosframe_addr4 *wh_mesh;
 
 	if (IEEE80211_QOS_HAS_SEQ(wh))
 		offset += 4;  // pad for 4 byte alignment
 
+	/* set the offset to 32 if the mesh control field is present */
+	wh_mesh = (struct ieee80211_qosframe_addr4 *)wh;
+	if (wh_mesh->i_qos[1] & 0x01)
+		offset = 32;
+
 	iv = (a_uint8_t *) wh;
 	iv = iv + offset;
 
@@ -97,7 +136,4 @@ ieee80211_tgt_crypto_encap(struct ieee80211_frame *wh,
 #undef CRYPTO_KEY_TYPE_WAPI
 #undef IEEE80211_WLAN_HDR_LEN
 }
-
-adf_os_export_symbol(ieee80211_tgt_crypto_encap);
-
 #undef  IEEE80211_ADDR_LEN