I'd like to replace my aging:

wi0 at pci2 dev 10 function 0: Intersil PRISM2.5 Mini-PCI WLAN (rev. 0x01)
wi0: interrupting at ioapic0 pin 22 (irq 10)
wi0: 802.11 address 00:05:5d:5b:c5:f5
wi0: using RF:PRISM2.5 MAC:ISL3874A(Mini-PCI)
wi0: Intersil Firmware: Primary (1.0.5), Station (1.3.4)
wi0: 11b rates: 1Mbps 2Mbps 5.5Mbps 11Mbps

which is running hostap. I'm running 4.0_BETA2 right now, so I'd
prefer something that'll work with 4.0. WEP/WPA would be nice, but
not mandatory. I had to disable WEP on my wi0 after upgrading to
4.0_BETA... I never did chase that problem up.

Recommendations? For something that'll just work out-of-the-box?

TIA,
-- 
Paul Ripke