diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:55:59 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:55:59 -0400 |
| commit | b01e86fee6c821e4e003fd4e9f65453ac478a58e (patch) | |
| tree | 21695e10cbe7001d2ccc8c87cee5e7a7865b1025 /drivers/net/wireless/hostap/hostap_hw.c | |
| parent | e889173c2c67dc288e9b050ab066cfae151b047e (diff) | |
| parent | 60d4684068ff1eec78f55b5888d0bd2d4cca1520 (diff) | |
Merge /spare/repo/linux-2.6 into upstream
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_hw.c')
| -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 | ||