usr.sbin/wpa: complete the revert of wpa import
This completes the revert of b51f459a2098622c31ed54f5c1bf0e03efce403b.