diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-28 14:15:37 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-28 14:15:37 -0700 |
| commit | 81aa143bae1595e478e7c20644fcd236936bfeaa (patch) | |
| tree | 5d16587d34a690f55be40ce802b01f6d3ee90f6e /drivers/staging/rtl8192u | |
| parent | 0c4df9c9697887c32db41fe6cdff847f92bce244 (diff) | |
| download | talos-obmc-linux-81aa143bae1595e478e7c20644fcd236936bfeaa.tar.gz talos-obmc-linux-81aa143bae1595e478e7c20644fcd236936bfeaa.zip | |
Revert "staging: rtl8192u: rename CONFIG_IEEE80211_CRYPT_TKIP"
This reverts commit f8cc81f845456c126fd0ab4d8379a8c47f5ca743.
It breaks the build in linux-next.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8192u')
| -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 800206755edd..d9a8299c48eb 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_LIB80211_CRYPT_TKIP +#ifdef CONFIG_IEEE80211_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 0bb474a193e6..029a97651797 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_LIB80211_CRYPT_TKIP +#ifdef CONFIG_IEEE80211_CRYPT_TKIP struct ieee80211_hdr *header; if (ieee->tkip_countermeasures && |
