Commit 81aa143b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "staging: rtl8192u: rename CONFIG_IEEE80211_CRYPT_TKIP" 



This reverts commit f8cc81f8.

It breaks the build in linux-next.

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0c4df9c9

drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb, 
	hdr = (struct ieee80211_hdr_4addr *) skb->data;

	hdrlen = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));



#ifdef CONFIG_LIB80211_CRYPT_TKIP

#ifdef CONFIG_IEEE80211_CRYPT_TKIP

	if (ieee->tkip_countermeasures &&

	    strcmp(crypt->ops->name, "TKIP") == 0) {

		if (net_ratelimit()) {

drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ int ieee80211_encrypt_fragment( 
		printk("=========>%s(), crypt is null\n", __func__);

		return -1;

	}

#ifdef CONFIG_LIB80211_CRYPT_TKIP

#ifdef CONFIG_IEEE80211_CRYPT_TKIP

	struct ieee80211_hdr *header;



	if (ieee->tkip_countermeasures &&

CRA Git | Maintained and supported by SUSTech CRA and CCSE