From 68834d1c47ddbaa8d8b29f4cc806849b4b967e82 Mon Sep 17 00:00:00 2001 From: Ksawlii Date: Sun, 24 Nov 2024 00:23:51 +0100 Subject: [PATCH] Revert "bonding: fix bond_ipsec_offload_ok return type" This reverts commit 38a3a70b3e404bf8419e48d61643ba34a044aea9. --- drivers/net/bonding/bond_main.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 349f1c9dd..c07b9bac1 100755 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -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 = {