hostapd: fix up patches after the last commit