net: mscc: ocelot: use a consistent cookie for MRP traps

The driver uses an identifier equal to (ocelot->num_phys_ports + port)
for MRP traps installed when the system is in the role of an MRC, and an
identifier equal to (port) otherwise.

Use the same identifier in both cases as a consolidation for the various
cookie values spread throughout the driver.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mscc/ocelot_mrp.c b/drivers/net/ethernet/mscc/ocelot_mrp.c
index 1fa5854..742242b 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot_mrp.c
+++ b/drivers/net/ethernet/mscc/ocelot_mrp.c
@@ -186,7 +186,8 @@ int ocelot_mrp_add_ring_role(struct ocelot *ocelot, int port,
        ocelot_mrp_save_mac(ocelot, ocelot_port);
 
        if (mrp->ring_role != BR_MRP_RING_ROLE_MRC)
-               return ocelot_mrp_copy_add_vcap(ocelot, port, 1, port);
+               return ocelot_mrp_copy_add_vcap(ocelot, port, 1,
+                                               port + ocelot->num_phys_ports);
 
        dst_port = ocelot_mrp_find_partner_port(ocelot, ocelot_port);
        if (dst_port == -1)