Message ID | 20210721101714.78977-1-mkl@pengutronix.de |
---|---|
State | Superseded |
Headers | show |
Series | [net-next,v2] net: switchdev: switchdev_handle_fdb_del_to_device(): fix no-op function for disabled CONFIG_NET_SWITCHDEV | expand |
Hi Marc, On Wed, Jul 21, 2021 at 12:17:14PM +0200, Marc Kleine-Budde wrote: > In patch 8ca07176ab00 ("net: switchdev: introduce a fanout helper for > SWITCHDEV_FDB_{ADD,DEL}_TO_DEVICE") new functionality including static > inline no-op functions if CONFIG_NET_SWITCHDEV is disabled was added. > > This patch fixes the following build error for disabled > CONFIG_NET_SWITCHDEV: > > | In file included from include/net/dsa.h:23, > | from net/core/flow_dissector.c:8: > | include/net/switchdev.h:410:1: error: expected identifier or ‘(’ before ‘{’ token > | 410 | { > | | ^ > | include/net/switchdev.h:399:1: warning: ‘switchdev_handle_fdb_del_to_device’ declared ‘static’ but never defined [-Wunused-function] > | 399 | switchdev_handle_fdb_del_to_device(struct net_device *dev, > | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > Fixes: 8ca07176ab00 ("net: switchdev: introduce a fanout helper for SWITCHDEV_FDB_{ADD,DEL}_TO_DEVICE") > Cc: Vladimir Oltean <vladimir.oltean@nxp.com> > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> > --- Thank you for the patch and sorry for the breakage, I've been waiting for my version to get accepted since yesterday: https://patchwork.kernel.org/project/netdevbpf/patch/20210720173557.999534-2-vladimir.oltean@nxp.com/
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Wed, 21 Jul 2021 12:17:14 +0200 you wrote: > In patch 8ca07176ab00 ("net: switchdev: introduce a fanout helper for > SWITCHDEV_FDB_{ADD,DEL}_TO_DEVICE") new functionality including static > inline no-op functions if CONFIG_NET_SWITCHDEV is disabled was added. > > This patch fixes the following build error for disabled > CONFIG_NET_SWITCHDEV: > > [...] Here is the summary with links: - [net-next,v2] net: switchdev: switchdev_handle_fdb_del_to_device(): fix no-op function for disabled CONFIG_NET_SWITCHDEV https://git.kernel.org/netdev/net-next/c/94111dfc18b8 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/include/net/switchdev.h b/include/net/switchdev.h index 6f57eb2e89cc..66468ff8cc0a 100644 --- a/include/net/switchdev.h +++ b/include/net/switchdev.h @@ -406,7 +406,7 @@ switchdev_handle_fdb_del_to_device(struct net_device *dev, const struct switchdev_notifier_fdb_info *fdb_info), int (*lag_del_cb)(struct net_device *dev, const struct net_device *orig_dev, const void *ctx, - const struct switchdev_notifier_fdb_info *fdb_info)); + const struct switchdev_notifier_fdb_info *fdb_info)) { return 0; }
In patch 8ca07176ab00 ("net: switchdev: introduce a fanout helper for SWITCHDEV_FDB_{ADD,DEL}_TO_DEVICE") new functionality including static inline no-op functions if CONFIG_NET_SWITCHDEV is disabled was added. This patch fixes the following build error for disabled CONFIG_NET_SWITCHDEV: | In file included from include/net/dsa.h:23, | from net/core/flow_dissector.c:8: | include/net/switchdev.h:410:1: error: expected identifier or ‘(’ before ‘{’ token | 410 | { | | ^ | include/net/switchdev.h:399:1: warning: ‘switchdev_handle_fdb_del_to_device’ declared ‘static’ but never defined [-Wunused-function] | 399 | switchdev_handle_fdb_del_to_device(struct net_device *dev, | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: 8ca07176ab00 ("net: switchdev: introduce a fanout helper for SWITCHDEV_FDB_{ADD,DEL}_TO_DEVICE") Cc: Vladimir Oltean <vladimir.oltean@nxp.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- changes since v1: - added net-next to patch subject include/net/switchdev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)