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 <pebolle@tiscali.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
index d9a8299c48eb59412426b8f93590316768e9e625..800206755edd23968b230acc8f92a1053cab6d80 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
@@ -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()) {

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
index 029a97651797140c34247a120d6ab08efff039c4..0bb474a193e6fa3ea74015a2c0924ada6a981ca4 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
@@ -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 &&