projects
/
open-ath9k-htc-firmware.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove all trailing whitespaces in one run
[open-ath9k-htc-firmware.git]
/
target_firmware
/
wlan
/
ieee80211_output.c
diff --git
a/target_firmware/wlan/ieee80211_output.c
b/target_firmware/wlan/ieee80211_output.c
index a6b360ad21730694228203354023eebb81a84252..dcfe9d49d4e05bd1984a6c67cb1b40b6c7a242c9 100755
(executable)
--- a/
target_firmware/wlan/ieee80211_output.c
+++ b/
target_firmware/wlan/ieee80211_output.c
@@
-48,10
+48,8
@@
#include <adf_net.h>
#include <if_llc.h>
#include <adf_net.h>
#include <if_llc.h>
-#include <if_ethersubr.h>
#include "ieee80211_var.h"
#include "ieee80211_var.h"
-#include "_ieee80211.h"
#include "ieee80211.h"
#include <wlan_hdr.h>
#include "ieee80211.h"
#include <wlan_hdr.h>
@@
-69,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;
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
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;
iv = (a_uint8_t *) wh;
iv = iv + offset;
@@
-132,7
+136,4
@@
ieee80211_tgt_crypto_encap(struct ieee80211_frame *wh,
#undef CRYPTO_KEY_TYPE_WAPI
#undef IEEE80211_WLAN_HDR_LEN
}
#undef CRYPTO_KEY_TYPE_WAPI
#undef IEEE80211_WLAN_HDR_LEN
}
-
-adf_os_export_symbol(ieee80211_tgt_crypto_encap);
-
-#undef IEEE80211_ADDR_LEN
+#undef IEEE80211_ADDR_LEN