aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJiri Benc <jbenc@suse.cz>2005-08-25 20:09:39 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-25 20:09:39 -0400
commit8d45ff7d7bd85d9066f5b498cda5c4a52ac36a7f (patch)
tree404fb9ba1a837bc9661bbbf45c3734adf3ef957a /drivers/net
parentThis removes support for old (and non-mainline) kernels from ipw2200. (diff)
downloadlinux-dev-8d45ff7d7bd85d9066f5b498cda5c4a52ac36a7f.tar.xz
linux-dev-8d45ff7d7bd85d9066f5b498cda5c4a52ac36a7f.zip
ipw2200: minor cleanups
This removes one trap for a programmer, few unused macros, and one unused struct. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Jiri Benc <jbenc@suse.cz>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ipw2200.c2
-rw-r--r--drivers/net/wireless/ipw2200.h10
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)
IPW_DEBUG_INFO("RATE MASK: 0x%08X\n", priv->rates_mask);
}
#else
-#define ipw_debug_config(x) do {} while (0);
+#define ipw_debug_config(x) do {} while (0)
#endif
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
};
-#define IPW_NORMAL 0
-#define IPW_NOWAIT 0
#define IPW_WAIT (1<<0)
#define IPW_QUIET (1<<1)
#define IPW_ROAMING (1<<2)
@@ -180,7 +178,7 @@ enum connection_manager_assoc_states
/* even if MAC WEP set (allows pre-encrypt) */
#define DCT_FLAG_NO_WEP 0x20
-#define IPW_
+
/* overwrite TSF field */
#define DCT_FLAG_TSF_REQD 0x40
@@ -513,12 +511,6 @@ struct notif_authenticate {
u16 status;
} __attribute__ ((packed));
-struct temperature
-{
- s32 measured;
- s32 active;
-} __attribute__ ((packed));
-
struct notif_calibration {
u8 data[104];
} __attribute__ ((packed));