net: mscc: ocelot: fix build error due to missing IEEE_8021QAZ_MAX_TCS
authorVladimir Oltean <vladimir.oltean@nxp.com>
Tue, 15 Mar 2022 13:12:15 +0000 (15:12 +0200)
committerJakub Kicinski <kuba@kernel.org>
Tue, 15 Mar 2022 18:47:11 +0000 (11:47 -0700)
IEEE_8021QAZ_MAX_TCS is defined in include/uapi/linux/dcbnl.h, which is
included by net/dcbnl.h. Then, linux/netdevice.h conditionally includes
net/dcbnl.h if CONFIG_DCB is enabled.

Therefore, when CONFIG_DCB is disabled, this indirect dependency is
broken.

There isn't a good reason to include net/dcbnl.h headers into the ocelot
switch library which exports low-level hardware API, so replace
IEEE_8021QAZ_MAX_TCS with OCELOT_NUM_TC which has the same value.

Fixes: 978777d0fb06 ("net: dsa: felix: configure default-prio and dscp priorities")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Link: https://lore.kernel.org/r/20220315131215.273450-1-vladimir.oltean@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/mscc/ocelot.c

index 41dbb1e..a26d613 100644 (file)
@@ -2917,7 +2917,7 @@ EXPORT_SYMBOL_GPL(ocelot_port_get_default_prio);
 
 int ocelot_port_set_default_prio(struct ocelot *ocelot, int port, u8 prio)
 {
-       if (prio >= IEEE_8021QAZ_MAX_TCS)
+       if (prio >= OCELOT_NUM_TC)
                return -ERANGE;
 
        ocelot_rmw_gix(ocelot,
@@ -2959,7 +2959,7 @@ int ocelot_port_add_dscp_prio(struct ocelot *ocelot, int port, u8 dscp, u8 prio)
 {
        int mask, val;
 
-       if (prio >= IEEE_8021QAZ_MAX_TCS)
+       if (prio >= OCELOT_NUM_TC)
                return -ERANGE;
 
        /* There is at least one app table priority (this one), so we need to