From 752bdc81b49f760806fe58236ee0a7a2259b9f52 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Sun, 28 Nov 2010 22:59:57 +0200 Subject: [PATCH] --- yaml --- r: 228227 b: refs/heads/master c: 1140bd9f30f4d6dac6b53365a70819ecd4cc8c54 h: refs/heads/master i: 228225: 9adc51b1b5e79dd629c79ad1a504c6dff9873931 228223: 05d26015b9701baa38022911b3b143518621664c v: v3 --- [refs] | 2 +- trunk/drivers/staging/winbond/sysdef.h | 2 -- trunk/drivers/staging/winbond/wb35reg_s.h | 4 ---- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index cdae1da6524b..1f655c29d71e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac5435b9800f313bdcd6a43444ceb1d89f241a5e +refs/heads/master: 1140bd9f30f4d6dac6b53365a70819ecd4cc8c54 diff --git a/trunk/drivers/staging/winbond/sysdef.h b/trunk/drivers/staging/winbond/sysdef.h index 7198708108bb..f8d8606a4efa 100644 --- a/trunk/drivers/staging/winbond/sysdef.h +++ b/trunk/drivers/staging/winbond/sysdef.h @@ -3,8 +3,6 @@ #ifndef SYS_DEF_H #define SYS_DEF_H -#define _USE_FALLBACK_RATE_ - #define _WPA2_ /* debug print options, mark what debug you don't need */ diff --git a/trunk/drivers/staging/winbond/wb35reg_s.h b/trunk/drivers/staging/winbond/wb35reg_s.h index 9d5993bfc1f4..9b782ededf43 100644 --- a/trunk/drivers/staging/winbond/wb35reg_s.h +++ b/trunk/drivers/staging/winbond/wb35reg_s.h @@ -51,11 +51,7 @@ struct hw_data; #define DEFAULT_CWMAX 1023 /* (M2C) CWmax. Its value is in the range 0-1023. */ #define DEFAULT_AID 1 /* (M34) AID. Its value is in the range 1-2007. */ -#ifdef _USE_FALLBACK_RATE_ #define DEFAULT_RATE_RETRY_LIMIT 2 /* (M38) as named */ -#else -#define DEFAULT_RATE_RETRY_LIMIT 7 /* (M38) as named */ -#endif #define DEFAULT_LONG_RETRY_LIMIT 7 /* (M38) LongRetryLimit. Its value is in the range 0-15. */ #define DEFAULT_SHORT_RETRY_LIMIT 7 /* (M38) ShortRetryLimit. Its value is in the range 0-15. */