summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/hostap/hostap_wlan.h
diff options
context:
space:
mode:
authorJouni Malinen <jkmaline@cc.hut.fi>2005-08-14 19:08:41 -0700
committerJeff Garzik <jgarzik@pobox.com>2005-08-14 23:06:27 -0400
commit67e0e473fb54e7657f6604236e42ef07fd7a2768 (patch)
tree97b8086510c2ec70ffdc607df62c0f651dbab3cb /drivers/net/wireless/hostap/hostap_wlan.h
parentea3f1865f33bd328bf043f47492f401a42de5edb (diff)
[PATCH] hostap: Use void *hw_priv instead of #ifdef in local data
Replace hardware model specific #ifdef's in struct local_info with void *hw_priv that is pointing to cs/pci/plx specific data structure. This removes unneeded #ifdef's and as such, is a step towards making it possible to share objects for hostap_hw.c and hostap_download.c with cs/pci/plx drivers without having to compile and link the same code separately for each one. Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_wlan.h')
-rw-r--r--drivers/net/wireless/hostap/hostap_wlan.h23
1 files changed, 2 insertions, 21 deletions
diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h
index 56416b43e41..7781e8264d6 100644
--- a/drivers/net/wireless/hostap/hostap_wlan.h
+++ b/drivers/net/wireless/hostap/hostap_wlan.h
@@ -876,27 +876,8 @@ struct local_info {
int io_debug_enabled;
#endif /* PRISM2_IO_DEBUG */
- /* struct local_info is used also in hostap.o that does not define
- * any PRISM2_{PCCARD,PLX,PCI}. Make sure that the hardware version
- * specific fields are in the end of the struct (these could also be
- * moved to void *priv or something like that). */
-#ifdef PRISM2_PCCARD
- dev_node_t node;
- dev_link_t *link;
- int sandisk_connectplus;
-#endif /* PRISM2_PCCARD */
-
-#ifdef PRISM2_PLX
- void __iomem *attr_mem;
- unsigned int cor_offset;
-#endif /* PRISM2_PLX */
-
-#ifdef PRISM2_PCI
- void __iomem *mem_start;
-#endif /* PRISM2_PCI */
-
- /* NOTE! Do not add common entries here after hardware version
- * specific blocks. */
+ /* Pointer to hardware model specific (cs,pci,plx) private data. */
+ void *hw_priv;
};