wpa_supplicant: update 2.1 -> 2.2, drop a patch

Fixes #3238.