diff options
| author | Paul Bolle | 2014-05-26 22:19:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-05-27 05:19:26 +0200 |
| commit | f8cc81f845456c126fd0ab4d8379a8c47f5ca743 (patch) | |
| tree | 05a41a769b30b88332cdb5433fb110dbe63f7efd | |
| parent | staging: r8821ae: Fix potential problem with rate control registration (diff) | |
| download | kernel-qcow2-linux-f8cc81f845456c126fd0ab4d8379a8c47f5ca743.tar.gz kernel-qcow2-linux-f8cc81f845456c126fd0ab4d8379a8c47f5ca743.tar.xz kernel-qcow2-linux-f8cc81f845456c126fd0ab4d8379a8c47f5ca743.zip | |
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>
| -rw-r--r-- | drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c index d9a8299c48eb..800206755edd 100644 --- 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 029a97651797..0bb474a193e6 100644 --- 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 && |