diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-24 00:42:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-24 00:42:07 -0400 |
| commit | 8d8b03297c96811501e3821edd4602b315458030 (patch) | |
| tree | 241e690a9b7957d48b6069940871f37aa9c7df5a /drivers/net/wireless | |
| parent | c67eebd67400c4c2ae1389317f1de0cbb3b7a1ca (diff) | |
| parent | 357eb4cf75fdb9dbe46b64d50f3670de6a45dc91 (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_hw.c | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/spectrum_cs.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c index dafaa5ff5aa6..d500012fdc7a 100644 --- a/drivers/net/wireless/hostap/hostap_hw.c +++ b/drivers/net/wireless/hostap/hostap_hw.c @@ -1042,6 +1042,9 @@ static int prism2_reset_port(struct net_device *dev) dev->name, local->fragm_threshold); } + /* Some firmwares lose antenna selection settings on reset */ + (void) hostap_set_antsel(local); + return res; } diff --git a/drivers/net/wireless/spectrum_cs.c b/drivers/net/wireless/spectrum_cs.c index 7f78b7801fb3..bcc7038130f6 100644 --- a/drivers/net/wireless/spectrum_cs.c +++ b/drivers/net/wireless/spectrum_cs.c @@ -242,7 +242,7 @@ spectrum_reset(struct pcmcia_device *link, int idle) u_int save_cor; /* Doing it if hardware is gone is guaranteed crash */ - if (pcmcia_dev_present(link)) + if (!pcmcia_dev_present(link)) return -ENODEV; /* Save original COR value */ |