refresh and refine 972-cpmac_multi_probe.patch, patch from sn9