Thank you @zeha for looking into fixing the actual cause rather than papering over the symptom.
Though I’m afraid that qcacld2 might be a dead-end and I’m already not feeling great with the time I put into making it work with each new kernel release… 