madwifi: merge fixes from trunk