[PATCH net-next] net: mscc: ocelot: fix build error due to missing IEEE_8021QAZ_MAX_TCS

[PATCH net-next] net: mscc: ocelot: fix build error due to missing IEEE_8021QAZ_MAX_TCS

[Vladimir Oltean]

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>
---
 drivers/net/ethernet/mscc/ocelot.c | 4 ++--
 1 file 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
-- 
2.25.1

Re: [PATCH net-next] net: mscc: ocelot: fix build error due to missing IEEE_8021QAZ_MAX_TCS

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Tue, 15 Mar 2022 15:12:15 +0200 you wrote:
> 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.
> 
> [...]

Here is the summary with links:
  - [net-next] net: mscc: ocelot: fix build error due to missing IEEE_8021QAZ_MAX_TCS
    https://git.kernel.org/netdev/net-next/c/72f56fdb97b2

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html