* [PATCH 2/4] atm: hide unused procfs functions
2023-05-16 19:45 [PATCH 1/4] net: isa: include net/Space.h Arnd Bergmann
@ 2023-05-16 19:45 ` Arnd Bergmann
2023-05-16 19:45 ` [PATCH 3/4] bridge: always declare tunnel functions Arnd Bergmann
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2023-05-16 19:45 UTC (permalink / raw)
To: netdev, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni
Cc: Arnd Bergmann, linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
When CONFIG_PROC_FS is disabled, the function declarations for some
procfs functions are hidden, but the definitions are still build,
as shown by this compiler warning:
net/atm/resources.c:403:7: error: no previous prototype for 'atm_dev_seq_start' [-Werror=missing-prototypes]
net/atm/resources.c:409:6: error: no previous prototype for 'atm_dev_seq_stop' [-Werror=missing-prototypes]
net/atm/resources.c:414:7: error: no previous prototype for 'atm_dev_seq_next' [-Werror=missing-prototypes]
Add another #ifdef to leave these out of the build.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
net/atm/resources.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/atm/resources.c b/net/atm/resources.c
index 2b2d33eeaf20..995d29e7fb13 100644
--- a/net/atm/resources.c
+++ b/net/atm/resources.c
@@ -400,6 +400,7 @@ int atm_dev_ioctl(unsigned int cmd, void __user *buf, int __user *sioc_len,
return error;
}
+#ifdef CONFIG_PROC_FS
void *atm_dev_seq_start(struct seq_file *seq, loff_t *pos)
{
mutex_lock(&atm_dev_mutex);
@@ -415,3 +416,4 @@ void *atm_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)
{
return seq_list_next(v, &atm_devs, pos);
}
+#endif
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] bridge: always declare tunnel functions
2023-05-16 19:45 [PATCH 1/4] net: isa: include net/Space.h Arnd Bergmann
2023-05-16 19:45 ` [PATCH 2/4] atm: hide unused procfs functions Arnd Bergmann
@ 2023-05-16 19:45 ` Arnd Bergmann
2023-05-17 7:33 ` Nikolay Aleksandrov
2023-05-16 19:45 ` [PATCH 4/4] mdio_bus: unhide mdio_bus_init prototype Arnd Bergmann
2023-05-18 4:40 ` [PATCH 1/4] net: isa: include net/Space.h patchwork-bot+netdevbpf
3 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2023-05-16 19:45 UTC (permalink / raw)
To: netdev, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni
Cc: Arnd Bergmann, Roopa Prabhu, Nikolay Aleksandrov, bridge,
linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
When CONFIG_BRIDGE_VLAN_FILTERING is disabled, two functions are still
defined but have no prototype or caller. This causes a W=1 warning for
the missing prototypes:
net/bridge/br_netlink_tunnel.c:29:6: error: no previous prototype for 'vlan_tunid_inrange' [-Werror=missing-prototypes]
net/bridge/br_netlink_tunnel.c:199:5: error: no previous prototype for 'br_vlan_tunnel_info' [-Werror=missing-prototypes]
The functions are already contitional on CONFIG_BRIDGE_VLAN_FILTERING,
and I coulnd't easily figure out the right set of #ifdefs, so just
move the declarations out of the #ifdef to avoid the warning,
at a small cost in code size over a more elaborate fix.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
net/bridge/br_private_tunnel.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/bridge/br_private_tunnel.h b/net/bridge/br_private_tunnel.h
index 2b053289f016..efb096025151 100644
--- a/net/bridge/br_private_tunnel.h
+++ b/net/bridge/br_private_tunnel.h
@@ -27,6 +27,10 @@ int br_process_vlan_tunnel_info(const struct net_bridge *br,
int br_get_vlan_tunnel_info_size(struct net_bridge_vlan_group *vg);
int br_fill_vlan_tunnel_info(struct sk_buff *skb,
struct net_bridge_vlan_group *vg);
+bool vlan_tunid_inrange(const struct net_bridge_vlan *v_curr,
+ const struct net_bridge_vlan *v_last);
+int br_vlan_tunnel_info(const struct net_bridge_port *p, int cmd,
+ u16 vid, u32 tun_id, bool *changed);
#ifdef CONFIG_BRIDGE_VLAN_FILTERING
/* br_vlan_tunnel.c */
@@ -43,10 +47,6 @@ void br_handle_ingress_vlan_tunnel(struct sk_buff *skb,
struct net_bridge_vlan_group *vg);
int br_handle_egress_vlan_tunnel(struct sk_buff *skb,
struct net_bridge_vlan *vlan);
-bool vlan_tunid_inrange(const struct net_bridge_vlan *v_curr,
- const struct net_bridge_vlan *v_last);
-int br_vlan_tunnel_info(const struct net_bridge_port *p, int cmd,
- u16 vid, u32 tun_id, bool *changed);
#else
static inline int vlan_tunnel_init(struct net_bridge_vlan_group *vg)
{
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 3/4] bridge: always declare tunnel functions
2023-05-16 19:45 ` [PATCH 3/4] bridge: always declare tunnel functions Arnd Bergmann
@ 2023-05-17 7:33 ` Nikolay Aleksandrov
0 siblings, 0 replies; 6+ messages in thread
From: Nikolay Aleksandrov @ 2023-05-17 7:33 UTC (permalink / raw)
To: Arnd Bergmann, netdev, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni
Cc: Arnd Bergmann, Roopa Prabhu, bridge, linux-kernel
On 16/05/2023 22:45, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> When CONFIG_BRIDGE_VLAN_FILTERING is disabled, two functions are still
> defined but have no prototype or caller. This causes a W=1 warning for
> the missing prototypes:
>
> net/bridge/br_netlink_tunnel.c:29:6: error: no previous prototype for 'vlan_tunid_inrange' [-Werror=missing-prototypes]
> net/bridge/br_netlink_tunnel.c:199:5: error: no previous prototype for 'br_vlan_tunnel_info' [-Werror=missing-prototypes]
>
> The functions are already contitional on CONFIG_BRIDGE_VLAN_FILTERING,
> and I coulnd't easily figure out the right set of #ifdefs, so just
> move the declarations out of the #ifdef to avoid the warning,
> at a small cost in code size over a more elaborate fix.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> net/bridge/br_private_tunnel.h | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
This should be for -net.
Fixes: 188c67dd1906 ("net: bridge: vlan options: add support for tunnel id dumping")
Fixes: 569da0822808 ("net: bridge: vlan options: add support for tunnel mapping set/del")
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
Thanks,
Nik
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 4/4] mdio_bus: unhide mdio_bus_init prototype
2023-05-16 19:45 [PATCH 1/4] net: isa: include net/Space.h Arnd Bergmann
2023-05-16 19:45 ` [PATCH 2/4] atm: hide unused procfs functions Arnd Bergmann
2023-05-16 19:45 ` [PATCH 3/4] bridge: always declare tunnel functions Arnd Bergmann
@ 2023-05-16 19:45 ` Arnd Bergmann
2023-05-18 4:40 ` [PATCH 1/4] net: isa: include net/Space.h patchwork-bot+netdevbpf
3 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2023-05-16 19:45 UTC (permalink / raw)
To: netdev, Andrew Lunn, Heiner Kallweit
Cc: Arnd Bergmann, Russell King, David S. Miller, Jakub Kicinski,
Oleksij Rempel, Paolo Abeni, Maxime Chevallier, linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
mdio_bus_init() is either used as a local module_init() entry,
or it gets called in phy_device.c. In the former case, there
is no declaration, which causes a warning:
drivers/net/phy/mdio_bus.c:1371:12: error: no previous prototype for 'mdio_bus_init' [-Werror=missing-prototypes]
Remove the #ifdef around the declaration to avoid the warning..
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
include/linux/phy.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/linux/phy.h b/include/linux/phy.h
index c5a0dc829714..6478838405a0 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -1900,10 +1900,8 @@ void phy_package_leave(struct phy_device *phydev);
int devm_phy_package_join(struct device *dev, struct phy_device *phydev,
int addr, size_t priv_size);
-#if IS_ENABLED(CONFIG_PHYLIB)
int __init mdio_bus_init(void);
void mdio_bus_exit(void);
-#endif
int phy_ethtool_get_strings(struct phy_device *phydev, u8 *data);
int phy_ethtool_get_sset_count(struct phy_device *phydev);
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/4] net: isa: include net/Space.h
2023-05-16 19:45 [PATCH 1/4] net: isa: include net/Space.h Arnd Bergmann
` (2 preceding siblings ...)
2023-05-16 19:45 ` [PATCH 4/4] mdio_bus: unhide mdio_bus_init prototype Arnd Bergmann
@ 2023-05-18 4:40 ` patchwork-bot+netdevbpf
3 siblings, 0 replies; 6+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-05-18 4:40 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: netdev, davem, edumazet, kuba, pabeni, arnd, linux-kernel
Hello:
This series was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Tue, 16 May 2023 21:45:33 +0200 you wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> The legacy drivers that still get called from net/Space.c have prototypes
> in net/Space, but this header is not included in most of the files that
> define those functions:
>
> drivers/net/ethernet/cirrus/cs89x0.c:1649:28: error: no previous prototype for 'cs89x0_probe' [-Werror=missing-prototypes]
> drivers/net/ethernet/8390/ne.c:947:28: error: no previous prototype for 'ne_probe' [-Werror=missing-prototypes]
> drivers/net/ethernet/8390/smc-ultra.c:167:28: error: no previous prototype for 'ultra_probe' [-Werror=missing-prototypes]
> drivers/net/ethernet/amd/lance.c:438:28: error: no previous prototype for 'lance_probe' [-Werror=missing-prototypes]
> drivers/net/ethernet/3com/3c515.c:422:20: error: no previous prototype for 'tc515_probe' [-Werror=missing-prototypes]
>
> [...]
Here is the summary with links:
- [1/4] net: isa: include net/Space.h
https://git.kernel.org/netdev/net/c/067dee65751b
- [2/4] atm: hide unused procfs functions
https://git.kernel.org/netdev/net/c/fb1b7be9b16c
- [3/4] bridge: always declare tunnel functions
https://git.kernel.org/netdev/net/c/89dcd87ce534
- [4/4] mdio_bus: unhide mdio_bus_init prototype
https://git.kernel.org/netdev/net/c/2e9f8ab68f42
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 6+ messages in thread