So Greg, how we move forward with this one? Keep the revert or integrate Leo's work on top of Johannes'?
It would be "resend with the fixes rolled in as a new backport".
Johannes, how important is your fix for the stable 6.x kernels when done properly?
Well CQM was broken completely for anything but (effectively) brcmfmac ... That means roaming decisions will be less optimal, mostly.
Is that annoying? Probably. Super critical? I guess not.
johannes