From: Johannes Berg <johannes@sipsolutions.net>
Date: Mon, 29 Jun 2020 16:27:17 +0200

We've got a couple of fixes here, and I took the liberty to include a
small code cleanup of some really stupid code, and a patch that adds
new AKM suites so we can use them in the drivers more easily.

Please pull and let me know if there's any problem.

Looks good, pulled, thanks!