net: mscc: ocelot: delete OCELOT_MRP_CPUQ

MRP frames are configured to be trapped to the CPU queue 7, and this
number is reflected in the extraction header. However, the information
isn't used anywhere, so just leave MRP frames to go to CPU queue 0
unless needed otherwise.

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 d763fb32a56c3982497a472f0c094dd2c97eba54..dc28736e2eb392771e36f6427082b793382cf30c 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot_mrp.c
+++ b/drivers/net/ethernet/mscc/ocelot_mrp.c
@@ -102,7 +102,6 @@ static int ocelot_mrp_copy_add_vcap(struct ocelot *ocelot, int port, int prio)
        filter->action.mask_mode = OCELOT_MASK_MODE_PERMIT_DENY;
        filter->action.port_mask = 0x0;
        filter->action.cpu_copy_ena = true;
-       filter->action.cpu_qu_num = OCELOT_MRP_CPUQ;
 
        err = ocelot_vcap_filter_add(ocelot, filter, NULL);
        if (err)

diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h
index cacb103e4bad623f17eb9644167eed4d4aa6e1fe..2d7456c0e77d104d3eba10a0741d7e0d815fb8ce 100644 (file)
--- a/include/soc/mscc/ocelot.h
+++ b/include/soc/mscc/ocelot.h
@@ -105,8 +105,6 @@
 #define REG_RESERVED_ADDR              0xffffffff
 #define REG_RESERVED(reg)              REG(reg, REG_RESERVED_ADDR)
 
-#define OCELOT_MRP_CPUQ                        7
-
 enum ocelot_target {
        ANA = 1,
        QS,