Joe Talbott has some changes for both Intel and non-Intel wifi NICs; please try out his branch and report the results.