|
@@ -9,7 +9,6 @@
|
|
|
* more details.
|
|
|
*/
|
|
|
|
|
|
-//#include <linux/config.h>
|
|
|
#include <linux/version.h>
|
|
|
#include <linux/module.h>
|
|
|
#include <linux/init.h>
|
|
@@ -131,7 +130,6 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm,
|
|
|
qc_included = ((WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA) &&
|
|
|
(WLAN_FC_GET_STYPE(fc) & 0x08));
|
|
|
*/
|
|
|
- // fixed by David :2006.9.6
|
|
|
qc_included = ((WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA) &&
|
|
|
(WLAN_FC_GET_STYPE(fc) & 0x80));
|
|
|
aad_len = 22;
|
|
@@ -210,7 +208,6 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
|
|
pos = skb_push(skb, CCMP_HDR_LEN);
|
|
|
memmove(pos, pos + CCMP_HDR_LEN, hdr_len);
|
|
|
pos += hdr_len;
|
|
|
-// mic = skb_put(skb, CCMP_MIC_LEN);
|
|
|
|
|
|
i = CCMP_PN_LEN - 1;
|
|
|
while (i >= 0) {
|
|
@@ -240,7 +237,6 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
|
|
u8 *e = key->tx_e;
|
|
|
u8 *s0 = key->tx_s0;
|
|
|
|
|
|
- //mic is moved to here by john
|
|
|
mic = skb_put(skb, CCMP_MIC_LEN);
|
|
|
|
|
|
ccmp_init_blocks(key->tfm, hdr, key->tx_pn, data_len, b0, b, s0);
|
|
@@ -445,7 +441,6 @@ static char * ieee80211_ccmp_print_stats(char *p, void *priv)
|
|
|
|
|
|
void ieee80211_ccmp_null(void)
|
|
|
{
|
|
|
-// printk("============>%s()\n", __FUNCTION__);
|
|
|
return;
|
|
|
}
|
|
|
|