P2P: Split p2p_channels_union() into two functions