diff options
| author |   Holger Schurig <hs4233@mail.mn-solutions.de> | 2007-05-25 12:37:58 -0400 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2007-06-11 14:28:39 -0400 |
| commit | 084708b61014776198c56d1606343d4f504c691e (patch) | |
| tree | 201a683b3a1eff6f8103eef7fe93690d970b09f3 /drivers/net/wireless/libertas/decl.h | |
| parent | [PATCH] libertas: move contents of fw.h to decl.h (diff) | |
| download | linux-dev-084708b61014776198c56d1606343d4f504c691e.tar.xz linux-dev-084708b61014776198c56d1606343d4f504c691e.zip | |
[PATCH] libertas: split module into two (libertas.ko and usb8xxx.ko)
* add CONFIG_LIBERTAS to Kconfig
* remove global variable libertas_fw_name, the USB module might want to
use a different default FW name than the CF module, so libertas_fw_name
is now local to if_usb.c
* exported some symbols as GPL
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/decl.h')
| -rw-r--r-- | drivers/net/wireless/libertas/decl.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h index 8b34336ff3db..d6fcb339f5c2 100644 --- a/drivers/net/wireless/libertas/decl.h +++ b/drivers/net/wireless/libertas/decl.h @@ -74,20 +74,16 @@ void libertas_mac_event_disconnected(wlan_private * priv); void libertas_send_iwevcustom_event(wlan_private * priv, s8 * str); /* fw.c */ -int libertas_init_fw(wlan_private * priv); +int libertas_init_fw(wlan_private * priv, char *fw_name); /* main.c */ struct chan_freq_power *libertas_get_region_cfp_table(u8 region, u8 band, int *cfp_no); -wlan_private *wlan_add_card(void *card); -int libertas_activate_card(wlan_private *priv); -int wlan_remove_card(wlan_private *priv); -int wlan_add_mesh(wlan_private *priv); -void wlan_remove_mesh(wlan_private *priv); - -/* preliminary here */ -int if_usb_register(void); -void if_usb_unregister(void); +wlan_private *libertas_add_card(void *card); +int libertas_activate_card(wlan_private *priv, char *fw_name); +int libertas_remove_card(wlan_private *priv); +int libertas_add_mesh(wlan_private *priv); +void libertas_remove_mesh(wlan_private *priv); #endif /* _WLAN_DECL_H_ */ |