So I tried to combine the work we already had internally with the series that veeru posted at https://lore.kernel.org/r/1640163883-12696-1-git-send-email-quic_vjakkam@xxxxxxxxxxx Hopefully I got all the bits right - but I think even if not we have enough time to fix it before EHT ships, so this might anyway be a good step to align between everyone. I did stick to 8 NSS for now, but if the spec becomes clearer either way we can obviously easily change. johannes