diff options
-rw-r--r-- | drivers/net/wireless/ipw2200.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ipw2200.h | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index fe328671192d..6d0b6b1df4ca 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
@@ -4485,7 +4485,7 @@ static void ipw_debug_config(struct ipw_priv *priv) | |||
4485 | IPW_DEBUG_INFO("RATE MASK: 0x%08X\n", priv->rates_mask); | 4485 | IPW_DEBUG_INFO("RATE MASK: 0x%08X\n", priv->rates_mask); |
4486 | } | 4486 | } |
4487 | #else | 4487 | #else |
4488 | #define ipw_debug_config(x) do {} while (0); | 4488 | #define ipw_debug_config(x) do {} while (0) |
4489 | #endif | 4489 | #endif |
4490 | 4490 | ||
4491 | static inline void ipw_set_fixed_rate(struct ipw_priv *priv, | 4491 | static inline void ipw_set_fixed_rate(struct ipw_priv *priv, |
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h index 746bcdb1c297..3bff09d93154 100644 --- a/drivers/net/wireless/ipw2200.h +++ b/drivers/net/wireless/ipw2200.h | |||
@@ -73,8 +73,6 @@ enum connection_manager_assoc_states | |||
73 | }; | 73 | }; |
74 | 74 | ||
75 | 75 | ||
76 | #define IPW_NORMAL 0 | ||
77 | #define IPW_NOWAIT 0 | ||
78 | #define IPW_WAIT (1<<0) | 76 | #define IPW_WAIT (1<<0) |
79 | #define IPW_QUIET (1<<1) | 77 | #define IPW_QUIET (1<<1) |
80 | #define IPW_ROAMING (1<<2) | 78 | #define IPW_ROAMING (1<<2) |
@@ -180,7 +178,7 @@ enum connection_manager_assoc_states | |||
180 | 178 | ||
181 | /* even if MAC WEP set (allows pre-encrypt) */ | 179 | /* even if MAC WEP set (allows pre-encrypt) */ |
182 | #define DCT_FLAG_NO_WEP 0x20 | 180 | #define DCT_FLAG_NO_WEP 0x20 |
183 | #define IPW_ | 181 | |
184 | /* overwrite TSF field */ | 182 | /* overwrite TSF field */ |
185 | #define DCT_FLAG_TSF_REQD 0x40 | 183 | #define DCT_FLAG_TSF_REQD 0x40 |
186 | 184 | ||
@@ -513,12 +511,6 @@ struct notif_authenticate { | |||
513 | u16 status; | 511 | u16 status; |
514 | } __attribute__ ((packed)); | 512 | } __attribute__ ((packed)); |
515 | 513 | ||
516 | struct temperature | ||
517 | { | ||
518 | s32 measured; | ||
519 | s32 active; | ||
520 | } __attribute__ ((packed)); | ||
521 | |||
522 | struct notif_calibration { | 514 | struct notif_calibration { |
523 | u8 data[104]; | 515 | u8 data[104]; |
524 | } __attribute__ ((packed)); | 516 | } __attribute__ ((packed)); |