madwifi: merge r17545, r17546 from trunk