Re: linux-next: build failure after merge of the net-next tree

Vladimir Oltean
2022-03-15T13:14:22Z

On Tue, Mar 15, 2022 at 10:44:21PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the net-next tree, today's linux-next build (arm64
> defconfig) failed like this:
>
> drivers/net/ethernet/mscc/ocelot.c: In function 'ocelot_port_set_default_prio':
> drivers/net/ethernet/mscc/ocelot.c:2920:21: error: 'IEEE_8021QAZ_MAX_TCS' undeclared (first use in this function)
> 2920 | if (prio >= IEEE_8021QAZ_MAX_TCS)
> | ^~~~~~~~~~~~~~~~~~~~
> drivers/net/ethernet/mscc/ocelot.c:2920:21: note: each undeclared identifier is reported only once for each function it appears in
> drivers/net/ethernet/mscc/ocelot.c: In function 'ocelot_port_add_dscp_prio':
> drivers/net/ethernet/mscc/ocelot.c:2962:21: error: 'IEEE_8021QAZ_MAX_TCS' undeclared (first use in this function)
> 2962 | if (prio >= IEEE_8021QAZ_MAX_TCS)
> | ^~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> 978777d0fb06 ("net: dsa: felix: configure default-prio and dscp priorities")
>
> I have applied the following fix up patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 15 Mar 2022 22:34:25 +1100
> Subject: [PATCH] fixup for "net: dsa: felix: configure default-prio and dscp priorities"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/net/ethernet/mscc/ocelot.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
> index 41dbb1e326c4..7c4bd3f8e7ec 100644
> --- a/drivers/net/ethernet/mscc/ocelot.c
> +++ b/drivers/net/ethernet/mscc/ocelot.c
> @@ -7,6 +7,7 @@
> #include <linux/dsa/ocelot.h>
> #include <linux/if_bridge.h>
> #include <linux/ptp_classify.h>
> +#include <net/dcbnl.h>
> #include <soc/mscc/ocelot_vcap.h>
> #include "ocelot.h"
> #include "ocelot_vcap.h"
> --
> 2.34.1
>
>
>
> --
> Cheers,
> Stephen Rothwell

Thanks. I've sent this patch: