diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-12 11:06:59 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-12 11:06:59 -0800 |
| commit | ab1ebc953081d4e50f8e6d2d8d89b2cde3184e78 (patch) | |
| tree | e25d01c62a4c7f3de78675faa6728b54848304e2 /net/mac80211/work.c | |
| parent | 70d279a7e2a6e308530822ba2bf4134cc0f5c091 (diff) | |
| parent | 409ec36c320d580a036045e603f96286c362c609 (diff) | |
| download | kernel_replicant_linux-ab1ebc953081d4e50f8e6d2d8d89b2cde3184e78.tar.gz kernel_replicant_linux-ab1ebc953081d4e50f8e6d2d8d89b2cde3184e78.tar.bz2 kernel_replicant_linux-ab1ebc953081d4e50f8e6d2d8d89b2cde3184e78.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/work.c')
| -rw-r--r-- | net/mac80211/work.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/work.c b/net/mac80211/work.c index 204f0a4db969..e73c8cae036b 100644 --- a/net/mac80211/work.c +++ b/net/mac80211/work.c @@ -30,7 +30,6 @@ #define IEEE80211_AUTH_MAX_TRIES 3 #define IEEE80211_ASSOC_TIMEOUT (HZ / 5) #define IEEE80211_ASSOC_MAX_TRIES 3 -#define IEEE80211_MAX_PROBE_TRIES 5 enum work_action { WORK_ACT_MISMATCH, |