diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-24 00:41:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-24 00:41:25 -0400 |
| commit | 357eb4cf75fdb9dbe46b64d50f3670de6a45dc91 (patch) | |
| tree | 0ba358be2a3a9a62f722838adea7fff8a1f946ff /drivers/net | |
| parent | c5ab964debe92d0ec7af330f350a3433c1b5b61e (diff) | |
| parent | 9b5cce07648d059a013444116bd0140b047b25a1 (diff) | |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_hw.c | 3 |
1 files changed, 3 insertions, 0 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) | |||
| 1042 | dev->name, local->fragm_threshold); | 1042 | dev->name, local->fragm_threshold); |
| 1043 | } | 1043 | } |
| 1044 | 1044 | ||
| 1045 | /* Some firmwares lose antenna selection settings on reset */ | ||
| 1046 | (void) hostap_set_antsel(local); | ||
| 1047 | |||
| 1045 | return res; | 1048 | return res; |
| 1046 | } | 1049 | } |
| 1047 | 1050 | ||