summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-08-24 00:41:25 -0400
committerJeff Garzik <jeff@garzik.org>2006-08-24 00:41:25 -0400
commit357eb4cf75fdb9dbe46b64d50f3670de6a45dc91 (patch)
tree0ba358be2a3a9a62f722838adea7fff8a1f946ff /drivers/net
parentc5ab964debe92d0ec7af330f350a3433c1b5b61e (diff)
parent9b5cce07648d059a013444116bd0140b047b25a1 (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.c3
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 dafaa5ff5aa..d500012fdc7 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;
}