tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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.

Cc: Martin Liska <mliska@suse.cz>
Cc: Jay Vosburgh <j.vosburgh@gmail.com>
Cc: Veaceslav Falico <vfalico@gmail.com>
Cc: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20221031114409.10417-1-jirislaby@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Jiri Slaby (SUSE) and committed by
Jakub Kicinski 777fa87c 7d841182

+2 -2
+2 -2
include/net/bond_alb.h
··· 156 156 void bond_alb_deinit_slave(struct bonding *bond, struct slave *slave); 157 157 void bond_alb_handle_link_change(struct bonding *bond, struct slave *slave, char link); 158 158 void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave); 159 - int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev); 160 - int bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev); 159 + netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev); 160 + netdev_tx_t bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev); 161 161 struct slave *bond_xmit_alb_slave_get(struct bonding *bond, 162 162 struct sk_buff *skb); 163 163 struct slave *bond_xmit_tlb_slave_get(struct bonding *bond,