From 846eec42ba24c27d1ad24123d33ddb75c2e2c842 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Mon, 13 Jul 2009 20:01:19 +0200 Subject: Staging: rtl8187se/ieee80211: remove OPENSUSE_SLED ifdefs Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8187se/TODO | 1 - drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 5 ----- drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 5 ----- drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c | 5 ----- 4 files changed, 16 deletions(-) (limited to 'drivers/staging/rtl8187se') diff --git a/drivers/staging/rtl8187se/TODO b/drivers/staging/rtl8187se/TODO index 74e79c7c794..a080cc90fbe 100644 --- a/drivers/staging/rtl8187se/TODO +++ b/drivers/staging/rtl8187se/TODO @@ -1,6 +1,5 @@ TODO: - prepare private ieee80211 stack for merge with rtl8192su's version: - - remove [IN]_OPENSUSE_SLED definitions - remove ENABLE_IPS ifdefs - rename struct ieee80211_hdr to struct ieee80211_hdr_4addr - rename struct ieee80211_hdr_3addr_QOS to struct ieee80211_hdr_3addrqos diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c index 39fcabc12be..72056d7db31 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c @@ -31,11 +31,6 @@ MODULE_AUTHOR("Jouni Malinen"); MODULE_DESCRIPTION("Host AP crypt: CCMP"); MODULE_LICENSE("GPL"); -#ifdef OPENSUSE_SLED -#ifndef IN_OPENSUSE_SLED -#define IN_OPENSUSE_SLED 1 -#endif -#endif #define AES_BLOCK_LEN 16 #define CCMP_HDR_LEN 8 diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c index 369a283af9c..85be6269f2c 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c @@ -31,11 +31,6 @@ MODULE_AUTHOR("Jouni Malinen"); MODULE_DESCRIPTION("Host AP crypt: TKIP"); MODULE_LICENSE("GPL"); -#ifdef OPENSUSE_SLED -#ifndef IN_OPENSUSE_SLED -#define IN_OPENSUSE_SLED 1 -#endif -#endif struct ieee80211_tkip_data { #define TKIP_KEY_LEN 32 diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c index 3841ef96f11..c6c3bc38459 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_wep.c @@ -28,11 +28,6 @@ MODULE_AUTHOR("Jouni Malinen"); MODULE_DESCRIPTION("Host AP crypt: WEP"); MODULE_LICENSE("GPL"); -#ifdef OPENSUSE_SLED -#ifndef IN_OPENSUSE_SLED -#define IN_OPENSUSE_SLED 1 -#endif -#endif struct prism2_wep_data { -- cgit v1.2.3