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

staging: rtl8192e: Remove dead code associated with CONFIG_RTLLIB_CRYPT_TKIP 



Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent a616feed

drivers/staging/rtl8192e/rtllib_rx.c

+0 −12
Original line number Diff line number Diff line
@@ -301,18 +301,6 @@ rtllib_rx_frame_decrypt(struct rtllib_device* ieee, struct sk_buff *skb, 
	hdr = (struct rtllib_hdr_4addr *) skb->data;

	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);

	res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv);

	atomic_dec(&crypt->refcnt);

drivers/staging/rtl8192e/rtllib_tx.c

+0 −14
Original line number Diff line number Diff line
@@ -192,20 +192,6 @@ int rtllib_encrypt_fragment( 
		printk("=========>%s(), crypt is null\n", __func__);

		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:

	 * IV (4 bytes), clear payload (including SNAP), ICV (4 bytes) */