Commit 69dbddce authored by Larry Finger's avatar Larry Finger

staging: rtl8192e: Remove dead code associated with CONFIG_RTLLIB_CRYPT_TKIP

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent a616feed
...@@ -301,18 +301,6 @@ rtllib_rx_frame_decrypt(struct rtllib_device* ieee, struct sk_buff *skb, ...@@ -301,18 +301,6 @@ rtllib_rx_frame_decrypt(struct rtllib_device* ieee, struct sk_buff *skb,
hdr = (struct rtllib_hdr_4addr *) skb->data; hdr = (struct rtllib_hdr_4addr *) skb->data;
hdrlen = rtllib_get_hdrlen(le16_to_cpu(hdr->frame_ctl)); hdrlen = rtllib_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
#ifdef CONFIG_RTLLIB_CRYPT_TKIP
if (ieee->tkip_countermeasures &&
strcmp(crypt->ops->name, "TKIP") == 0) {
if (net_ratelimit()) {
printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
"received packet from " MAC_FMT "\n",
ieee->dev->name, MAC_ARG(hdr->addr2));
}
return -1;
}
#endif
atomic_inc(&crypt->refcnt); atomic_inc(&crypt->refcnt);
res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv); res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv);
atomic_dec(&crypt->refcnt); atomic_dec(&crypt->refcnt);
......
...@@ -192,20 +192,6 @@ int rtllib_encrypt_fragment( ...@@ -192,20 +192,6 @@ int rtllib_encrypt_fragment(
printk("=========>%s(), crypt is null\n", __func__); printk("=========>%s(), crypt is null\n", __func__);
return -1; return -1;
} }
#ifdef CONFIG_RTLLIB_CRYPT_TKIP
struct rtllib_hdr_1addr *header;
if (ieee->tkip_countermeasures &&
crypt && crypt->ops && strcmp(crypt->ops->name, "TKIP") == 0) {
header = (struct rtllib_hdr_1addr *) frag->data;
if (net_ratelimit()) {
printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
"TX packet to " MAC_FMT "\n",
ieee->dev->name, MAC_ARG(header->addr1));
}
return -1;
}
#endif
/* To encrypt, frame format is: /* To encrypt, frame format is:
* IV (4 bytes), clear payload (including SNAP), ICV (4 bytes) */ * IV (4 bytes), clear payload (including SNAP), ICV (4 bytes) */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment