diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-05-05 13:35:45 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-05-05 13:35:45 -0700 |
| commit | 644bca1d48139ad77570c24d22bafaf8e438cf03 (patch) | |
| tree | 37db3b2976c7d4f1c4541fe6946582d242a405a2 /include/net | |
| parent | 93e0401e0fc0c54b0ac05b687cd135c2ac38187c (diff) | |
| parent | cb9e6e584d58420df182102674e636fb841dae4c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
There's a fix which landed in net-next, pull it in along
with the couple of minor cleanups.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bonding.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/bonding.h b/include/net/bonding.h index c3843239517d..a60a24923b55 100644 --- a/include/net/bonding.h +++ b/include/net/bonding.h @@ -659,6 +659,7 @@ void bond_destroy_sysfs(struct bond_net *net); void bond_prepare_sysfs_group(struct bonding *bond); int bond_sysfs_slave_add(struct slave *slave); void bond_sysfs_slave_del(struct slave *slave); +void bond_xdp_set_features(struct net_device *bond_dev); int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, struct netlink_ext_ack *extack); int bond_release(struct net_device *bond_dev, struct net_device *slave_dev); |