madwifi: merge r15713 and r15824