summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorVladimir Oltean <vladimir.oltean@nxp.com>2022-03-15 15:12:15 +0200
committerJakub Kicinski <kuba@kernel.org>2022-03-15 11:47:11 -0700
commit72f56fdb97b26bc9a1ce297a636b91c19593eb19 (patch)
treea0bbda1519c2415444ff395fa17587bdec1273aa /drivers
parentc24f657791fd2df9d7a5491ac43b63658ea7187d (diff)
downloadlinux-stable-72f56fdb97b26bc9a1ce297a636b91c19593eb19.tar.gz
linux-stable-72f56fdb97b26bc9a1ce297a636b91c19593eb19.tar.bz2
linux-stable-72f56fdb97b26bc9a1ce297a636b91c19593eb19.zip
net: mscc: ocelot: fix build error due to missing IEEE_8021QAZ_MAX_TCS
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/mscc/ocelot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index 41dbb1e326c4..a26d613088ef 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -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