Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "bonding: fix bond_ipsec_offload_ok return type"

Browse source 
This reverts commit 38a3a70b3e.
This commit is contained in:
Ksawlii 2024-11-24 00:23:51 +01:00
parent 6de0889cec
commit 68834d1c47
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/net/bonding/bond_main.c
View file

@ -557,28 +557,34 @@ static bool bond_ipsec_offload_ok(struct sk_buff *skb, struct xfrm_state *xs)
struct net_device *real_dev;
struct slave *curr_active;
struct bonding *bond;
bool ok = false;
int err;
bond = netdev_priv(bond_dev);
rcu_read_lock();
curr_active = rcu_dereference(bond->curr_active_slave);
real_dev = curr_active->dev;
if (BOND_MODE(bond) != BOND_MODE_ACTIVEBACKUP)
if (BOND_MODE(bond) != BOND_MODE_ACTIVEBACKUP) {
err = false;
goto out;
}
if (!xs->xso.real_dev)
if (!xs->xso.real_dev) {
err = false;
goto out;
}
if (!real_dev->xfrmdev_ops ||
!real_dev->xfrmdev_ops->xdo_dev_offload_ok ||
netif_is_bond_master(real_dev))
netif_is_bond_master(real_dev)) {
err = false;
goto out;
}
ok = real_dev->xfrmdev_ops->xdo_dev_offload_ok(skb, xs);
err = real_dev->xfrmdev_ops->xdo_dev_offload_ok(skb, xs);
out:
rcu_read_unlock();
return ok;
return err;
}
static const struct xfrmdev_ops bond_xfrmdev_ops = {