iwx0 at pci0 dev 20 function 3 "Intel Wi-Fi 6 AX211" rev 0x01, msix
iwx0: hw rev 0x370, fw 77.f92b5fed.0, pnvm ce1a5094, address a0:29:42:f6:8f:1a

with your diff keeps working as before against Keenetic Challenger AP
that sets the PMF capable, but not required bit according to tcpdump.

Same for some Aruba APs, no problem observed with or without your diff.