[PATCH 04/10] Staging: rtl8192su/ieee80211: remove OPENSUSE_SLED ifdefs

Bartlomiej Zolnierkiewicz
2009-07-13T18:07:34Z

Subject: [PATCH] Staging: rtl8192su/ieee80211: remove OPENSUSE_SLED ifdefs

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
drivers/staging/rtl8192su/TODO | 1 -
drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_ccmp.c | 4 ----
drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 4 ----
drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_wep.c | 3 ---
4 files changed, 12 deletions(-)

Index: b/drivers/staging/rtl8192su/TODO
===================================================================
--- a/drivers/staging/rtl8192su/TODO
+++ b/drivers/staging/rtl8192su/TODO
@@ -1,6 +1,5 @@
TODO:
- prepare private ieee80211 stack for merge with rtl8187se's version:
- - remove [IN]_OPENSUSE_SLED definitions
- remove superflous container_of definition from ieee80211.h
- remove rtl8192su's specific dead code
- cleanup ieee80211.h
Index: b/drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_ccmp.c
===================================================================
--- a/drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_ccmp.c
+++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_ccmp.c
@@ -31,10 +31,6 @@ MODULE_AUTHOR("Jouni Malinen");
MODULE_DESCRIPTION("Host AP crypt: CCMP");
MODULE_LICENSE("GPL");

-#ifndef OPENSUSE_SLED
-#define OPENSUSE_SLED 0
-#endif
-
#define AES_BLOCK_LEN 16
#define CCMP_HDR_LEN 8
#define CCMP_MIC_LEN 8
Index: b/drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c
===================================================================
--- a/drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c
+++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_tkip.c
@@ -31,10 +31,6 @@ MODULE_AUTHOR("Jouni Malinen");
MODULE_DESCRIPTION("Host AP crypt: TKIP");
MODULE_LICENSE("GPL");

-#ifndef OPENSUSE_SLED
-#define OPENSUSE_SLED 0
-#endif
-
struct ieee80211_tkip_data {
#define TKIP_KEY_LEN 32
u8 key[TKIP_KEY_LEN];
Index: b/drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_wep.c
===================================================================
--- a/drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_wep.c
+++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_crypt_wep.c
@@ -27,9 +27,6 @@
MODULE_AUTHOR("Jouni Malinen");
MODULE_DESCRIPTION("Host AP crypt: WEP");
MODULE_LICENSE("GPL");
-#ifndef OPENSUSE_SLED
-#define OPENSUSE_SLED 0
-#endif

struct prism2_wep_data {
u32 iv;