staging: rtl8192u: rename CONFIG_IEEE80211_CRYPT_TKIP

PATCH New Paul Bolle 1 participant 1 message May 26, 2014 Staging

Share & tools

Paul Bolle

author

2014-05-26 20:19 UTC #0 lore raw

PATCH 1/1 staging: rtl8192u: rename CONFIG_IEEE80211_CRYPT_TKIP

The Kconfig symbol IEEE80211_CRYPT_TKIP was renamed to LIB80211_CRYPT_TKIP in commit 274bfb8dc5ff ("lib80211: absorb crypto bits from net/ieee80211"). So when rtl8192u was added as a staging driver in v2.6.33 its checks for CONFIG_IEEE80211_CRYPT_TKIP were already outdated. Use CONFIG_LIB80211_CRYPT_TKIP instead, as was clearly intended.

Signed-off-by Paul Bolle <[email protected]>

---
Compile tested only. Done on top of next-20140526.

 drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +-
 drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +1 -1

index 0cd6a001bcc5..dc89b43d9fea 100644
@@ -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_IEEE80211_CRYPT_TKIP
+#ifdef CONFIG_LIB80211_CRYPT_TKIP
 	if (ieee->tkip_countermeasures &&
 	    strcmp(crypt->ops->name, "TKIP") == 0) {
 		if (net_ratelimit()) {

drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +1 -1

index 029a97651797..0bb474a193e6 100644
@@ -191,7 +191,7 @@ int ieee80211_encrypt_fragment(
 		printk("=========>%s(), crypt is null\n", __func__);
 		return -1;
 	}
-#ifdef CONFIG_IEEE80211_CRYPT_TKIP
+#ifdef CONFIG_LIB80211_CRYPT_TKIP
 	struct ieee80211_hdr *header;
 
 	if (ieee->tkip_countermeasures &&

Signature · 1 line

1.9.0