diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-23 14:22:14 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-23 14:22:14 -0400 |
| commit | 4c2be501b7e8695f8bdf4f7d5f51595ed55eea44 (patch) | |
| tree | d111c2d4601c1e1bdbfbbd585afaee9a8be6f2a6 | |
| parent | 69758820a42da207bdc775d6eccf1f9fb67cd62e (diff) | |
| parent | 9b5cce07648d059a013444116bd0140b047b25a1 (diff) | |
| download | linux-4c2be501b7e8695f8bdf4f7d5f51595ed55eea44.tar.gz | |
Merge branch 'upstream-fixes' into upstream
| -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 dafaa5ff5aa693..d500012fdc7a54 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 7f78b7801fb3de..bcc7038130f69a 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 */ |