diff options
author | Shan Wei <shanwei@cn.fujitsu.com> | 2011-03-04 02:14:16 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-03-07 13:48:30 -0500 |
commit | 2d0123a5d635e336dbab21eba62e8dd4eb3e39a0 (patch) | |
tree | 9f110902e78275603136f07c18cceac47e8c817b /net | |
parent | e4b0b32aa1c0dd7ae6340833dd6b19de46409a88 (diff) |
mac80211: remove unused macros
Compile test only.
Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/key.h | 1 | ||||
-rw-r--r-- | net/mac80211/rc80211_pid.h | 3 | ||||
-rw-r--r-- | net/mac80211/work.c | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/net/mac80211/key.h b/net/mac80211/key.h index 8106aa1b7466..4ddbe27eb570 100644 --- a/net/mac80211/key.h +++ b/net/mac80211/key.h | |||
@@ -21,7 +21,6 @@ | |||
21 | 21 | ||
22 | #define WEP_IV_LEN 4 | 22 | #define WEP_IV_LEN 4 |
23 | #define WEP_ICV_LEN 4 | 23 | #define WEP_ICV_LEN 4 |
24 | #define ALG_TKIP_KEY_LEN 32 | ||
25 | #define ALG_CCMP_KEY_LEN 16 | 24 | #define ALG_CCMP_KEY_LEN 16 |
26 | #define CCMP_HDR_LEN 8 | 25 | #define CCMP_HDR_LEN 8 |
27 | #define CCMP_MIC_LEN 8 | 26 | #define CCMP_MIC_LEN 8 |
diff --git a/net/mac80211/rc80211_pid.h b/net/mac80211/rc80211_pid.h index 1a873f00691a..6510f8ee738e 100644 --- a/net/mac80211/rc80211_pid.h +++ b/net/mac80211/rc80211_pid.h | |||
@@ -24,9 +24,6 @@ | |||
24 | /* Fixed point arithmetic shifting amount. */ | 24 | /* Fixed point arithmetic shifting amount. */ |
25 | #define RC_PID_ARITH_SHIFT 8 | 25 | #define RC_PID_ARITH_SHIFT 8 |
26 | 26 | ||
27 | /* Fixed point arithmetic factor. */ | ||
28 | #define RC_PID_ARITH_FACTOR (1 << RC_PID_ARITH_SHIFT) | ||
29 | |||
30 | /* Proportional PID component coefficient. */ | 27 | /* Proportional PID component coefficient. */ |
31 | #define RC_PID_COEFF_P 15 | 28 | #define RC_PID_COEFF_P 15 |
32 | /* Integral PID component coefficient. */ | 29 | /* Integral PID component coefficient. */ |
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 @@ | |||
30 | #define IEEE80211_AUTH_MAX_TRIES 3 | 30 | #define IEEE80211_AUTH_MAX_TRIES 3 |
31 | #define IEEE80211_ASSOC_TIMEOUT (HZ / 5) | 31 | #define IEEE80211_ASSOC_TIMEOUT (HZ / 5) |
32 | #define IEEE80211_ASSOC_MAX_TRIES 3 | 32 | #define IEEE80211_ASSOC_MAX_TRIES 3 |
33 | #define IEEE80211_MAX_PROBE_TRIES 5 | ||
34 | 33 | ||
35 | enum work_action { | 34 | enum work_action { |
36 | WORK_ACT_MISMATCH, | 35 | WORK_ACT_MISMATCH, |