diff options
| author | David Kilroy <kilroyd@gmail.com> | 2008-08-21 23:27:54 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-08-22 19:28:05 -0400 |
| commit | 3994d502017a2239e30152d1231843ad05d04a7b (patch) | |
| tree | c4f15d1b95783d035d954173167ff08e65665461 /drivers/net/wireless/orinoco.h | |
| parent | 8f5ae73c5366128d3800cf9765507422bcf1ef96 (diff) | |
| download | kernel-crypto-3994d502017a2239e30152d1231843ad05d04a7b.tar.gz kernel-crypto-3994d502017a2239e30152d1231843ad05d04a7b.tar.xz kernel-crypto-3994d502017a2239e30152d1231843ad05d04a7b.zip | |
orinoco: Invoke firmware download in main driver
Firmware download is enabled for Agere in orinoco_cs. Symbol firmware
download has been moved out of spectrum_cs into orinoco_cs. Firmware
download is not enabled for Intersil.
Symbol based firmware is restricted to only download on spectrum_cs
based cards.
The firmware names are hardcoded for each firmware type.
Signed-off-by: David Kilroy <kilroyd@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/orinoco.h')
| -rw-r--r-- | drivers/net/wireless/orinoco.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/wireless/orinoco.h b/drivers/net/wireless/orinoco.h index c6b1858abde..e0acb633e9d 100644 --- a/drivers/net/wireless/orinoco.h +++ b/drivers/net/wireless/orinoco.h @@ -44,7 +44,9 @@ typedef struct { struct orinoco_private { void *card; /* Pointer to card dependent structure */ + struct device *dev; int (*hard_reset)(struct orinoco_private *); + int (*stop_fw)(struct orinoco_private *, int); /* Synchronisation stuff */ spinlock_t lock; @@ -83,6 +85,7 @@ struct orinoco_private { unsigned int has_preamble:1; unsigned int has_sensitivity:1; unsigned int has_hostscan:1; + unsigned int do_fw_download:1; unsigned int broken_disableport:1; unsigned int broken_monitor:1; @@ -130,8 +133,10 @@ extern int orinoco_debug; /* Exported prototypes */ /********************************************************************/ -extern struct net_device *alloc_orinocodev(int sizeof_card, - int (*hard_reset)(struct orinoco_private *)); +extern struct net_device *alloc_orinocodev( + int sizeof_card, struct device *device, + int (*hard_reset)(struct orinoco_private *), + int (*stop_fw)(struct orinoco_private *, int)); extern void free_orinocodev(struct net_device *dev); extern int __orinoco_up(struct net_device *dev); extern int __orinoco_down(struct net_device *dev); |