Revert "wpa: Import wpa 2.10."
This reverts commit 5eb81a4b4028113e3c319f21a1db6b67613ec7ab, reversing
changes made to c6806434e79079f4f9419c3ba4fec37efcaa1635 and
this reverts commit 679ff6112361d2660f4e0c3cda71198a5e773a25.
What happend is git rebase --rebase-merges doesn't do what is expected.