Skip to content

Commit 89dcd87

Browse files
arndbkuba-moo
authored andcommitted
bridge: always declare tunnel functions
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. Fixes: 188c67d ("net: bridge: vlan options: add support for tunnel id dumping") Fixes: 569da08 ("net: bridge: vlan options: add support for tunnel mapping set/del") Signed-off-by: Arnd Bergmann <[email protected]> Acked-by: Nikolay Aleksandrov <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent fb1b7be commit 89dcd87

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

net/bridge/br_private_tunnel.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ int br_process_vlan_tunnel_info(const struct net_bridge *br,
2727
int br_get_vlan_tunnel_info_size(struct net_bridge_vlan_group *vg);
2828
int br_fill_vlan_tunnel_info(struct sk_buff *skb,
2929
struct net_bridge_vlan_group *vg);
30+
bool vlan_tunid_inrange(const struct net_bridge_vlan *v_curr,
31+
const struct net_bridge_vlan *v_last);
32+
int br_vlan_tunnel_info(const struct net_bridge_port *p, int cmd,
33+
u16 vid, u32 tun_id, bool *changed);
3034

3135
#ifdef CONFIG_BRIDGE_VLAN_FILTERING
3236
/* br_vlan_tunnel.c */
@@ -43,10 +47,6 @@ void br_handle_ingress_vlan_tunnel(struct sk_buff *skb,
4347
struct net_bridge_vlan_group *vg);
4448
int br_handle_egress_vlan_tunnel(struct sk_buff *skb,
4549
struct net_bridge_vlan *vlan);
46-
bool vlan_tunid_inrange(const struct net_bridge_vlan *v_curr,
47-
const struct net_bridge_vlan *v_last);
48-
int br_vlan_tunnel_info(const struct net_bridge_port *p, int cmd,
49-
u16 vid, u32 tun_id, bool *changed);
5050
#else
5151
static inline int vlan_tunnel_init(struct net_bridge_vlan_group *vg)
5252
{

0 commit comments

Comments
 (0)