lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] hostap: Use void *hw_priv instead of #ifdef in local data

Browse Source 
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>
This commit is contained in:
Jouni Malinen
2005-08-14 19:08:41 -07:00
committed by Jeff Garzik
parent ea3f1865f3
commit 67e0e473fb
4 changed files with 166 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/wireless/hostap/hostap_wlan.h
View File

@ -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;
};