rfkill: prep for rfkill API changes