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

[Stephen Rothwell]

Hi all,

After merging the net-next tree, today's linux-next build (powerpc
pseries_le_defconfig) failed like this:

net/bridge/br_multicast.c: In function '__br_multicast_enable_port':
net/bridge/br_multicast.c:1743:3: error: implicit declaration of function 'br_ip6_multicast_add_router'; did you mean 'br_ip4_multicast_add_router'? [-Werror=implicit-function-declaration]
 1743 |   br_ip6_multicast_add_router(br, port);
      |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~
      |   br_ip4_multicast_add_router
net/bridge/br_multicast.c: At top level:
net/bridge/br_multicast.c:2804:13: warning: conflicting types for 'br_ip6_multicast_add_router'
 2804 | static void br_ip6_multicast_add_router(struct net_bridge *br,
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~
net/bridge/br_multicast.c:2804:13: error: static declaration of 'br_ip6_multicast_add_router' follows non-static declaration
net/bridge/br_multicast.c:1743:3: note: previous implicit declaration of 'br_ip6_multicast_add_router' was here
 1743 |   br_ip6_multicast_add_router(br, port);
      |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  a3c02e769efe ("net: bridge: mcast: split multicast router state for IPv4 and IPv6")

# CONFIG_IPV6 is not set

I have reverted that commit for today (along with commit

  3b85f9ba3480 ("net: bridge: mcast: export multicast router presence adjacent to a port")

in case it depends on a3c02e769efe).

-- 
Cheers,
Stephen Rothwell

Attachment: pgp069Dz126vh.pgp
Description: OpenPGP digital signature