While adding support for newer fws, I decided to fix up some missing pieces for r570, along with a refactor of a function with too many args to use a struct.
These are all -next material, I don't think they fix anything at this time, but I'd like to have them upstream just in case. Dave.
