Revert "tests: Dynamic hwsim p2ps_channel_active_go_and_station_different_mcc"

This reverts commit 78fdab307e4f10275795a196489a4894b0b437d3. This test
case needs MCC support on two stations, so the earlier attempt to handle
this with one dynamic interface is not sufficient.

Signed-off-by: Jouni Malinen <j@w1.fi>

tests/hwsim/test_p2ps.py

@@ -1435,17 +1435,9 @@ def test_p2ps_channel_active_go_and_station_different(dev, apdev):
 
 def test_p2ps_channel_active_go_and_station_different_mcc(dev, apdev):
     """P2PS connection, active P2P GO and station on channel"""
-    with HWSimRadio(n_channels=2) as (radio, iface):
-        wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5')
-        wpas.interface_add(iface)
-
-        if wpas.get_mcc() < 2:
-            raise Exception("New radio does not support MCC")
-
-        ndev = [ wpas, dev[1] ]
-        _test_p2ps_channel_active_go_and_station_different_mcc(ndev, apdev)
+    if dev[0].get_mcc() == 1:
+        raise HwsimSkip('Skip due to MCC not being enabled')
 
-def _test_p2ps_channel_active_go_and_station_different_mcc(dev, apdev):
     set_no_group_iface(dev[0], 0)
     set_no_group_iface(dev[1], 0)