latona: include wifi p2p support
latona: cleanup