bonding (gcc13): synchronize bond_{a,t}lb_xmit() types
Subsystems (3)
PATCH 1/1 bonding (gcc13): synchronize bond_{a,t}lb_xmit() types
Both bond_alb_xmit() and bond_tlb_xmit() produce a valid warning with
gcc-13:
drivers/net/bonding/bond_alb.c:1409:13: error: conflicting types for 'bond_tlb_xmit' due to enum/integer mismatch; have 'netdev_tx_t(struct sk_buff *, struct net_device *)' ... include/net/bond_alb.h:160:5: note: previous declaration of 'bond_tlb_xmit' with type 'int(struct sk_buff *, struct net_device *)'
drivers/net/bonding/bond_alb.c:1523:13: error: conflicting types for 'bond_alb_xmit' due to enum/integer mismatch; have 'netdev_tx_t(struct sk_buff *, struct net_device *)' ... include/net/bond_alb.h:159:5: note: previous declaration of 'bond_alb_xmit' with type 'int(struct sk_buff *, struct net_device *)'
I.e. the return type of the declaration is int, while the definitions spell netdev_tx_t. Synchronize both of them to the latter.
--- include/net/bond_alb.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/net/bond_alb.h +2 -2
@@ -156,8 +156,8 @@ int bond_alb_init_slave(struct bonding *bond, struct slave *slave);void bond_alb_deinit_slave (struct bonding *bond,struct slave *slave);void bond_alb_handle_link_change (struct bonding *bond,struct slave *slave,char link);void bond_alb_handle_active_change (struct bonding *bond,struct slave *new_slave); -int bond_alb_xmit (struct sk_buff *skb,struct net_device *bond_dev); -int bond_tlb_xmit (struct sk_buff *skb,struct net_device *bond_dev); +netdev_tx_t bond_alb_xmit (struct sk_buff *skb,struct net_device *bond_dev); +netdev_tx_t bond_tlb_xmit (struct sk_buff *skb,struct net_device *bond_dev);struct slave *bond_xmit_alb_slave_get (struct bonding *bond,struct sk_buff *skb); struct slave *bond_xmit_tlb_slave_get(struct bonding *bond,
Signature · 1 line
2.38.1
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Mon, 31 Oct 2022 12:44:09 +0100 you wrote:
Both
bond_alb_xmit()andbond_tlb_xmit()produce a valid warning with
gcc-13:
drivers/net/bonding/bond_alb.c:1409:13: error: conflicting types for 'bond_tlb_xmit' due to enum/integer mismatch; have 'netdev_tx_t(struct sk_buff *, struct net_device *)' ...include/net/bond_alb.h:160:5: note: previous declaration of 'bond_tlb_xmit' with type 'int(struct sk_buff *, struct net_device *)'
drivers/net/bonding/bond_alb.c:1523:13: error: conflicting types for 'bond_alb_xmit' due to enum/integer mismatch; have 'netdev_tx_t(struct sk_buff *, struct net_device *)' ...include/net/bond_alb.h:159:5: note: previous declaration of 'bond_alb_xmit' with type 'int(struct sk_buff *, struct net_device *)'[...]
Here is the summary with links:
- bonding (gcc13): synchronize bond_{a,t}lb_xmit() types
https://git.kernel.org/netdev/net-next/c/777fa87c7682
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html