bonding: fix bond_ipsec_offload_ok return type

[ Upstream commit fc59b9a5f7201b9f7272944596113a82cc7773d5 ]

Fix the return type which should be bool.

Fixes: 955b785ec6b3 ("bonding: fix suspicious RCU usage in bond_ipsec_offload_ok()")
Signed-off-by: Nikolay Aleksandrov <razor@blackwall.org>
Reviewed-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index c07b9bac1a6a054598e88751f2196efe769973a8..349f1c9dd58818598dd6ff86480213006854ac32 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -557,34 +557,28 @@ 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;
-       int err;
+       bool ok = false;
 
        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) {
-               err = false;
+       if (BOND_MODE(bond) != BOND_MODE_ACTIVEBACKUP)
                goto out;
-       }
 
-       if (!xs->xso.real_dev) {
-               err = false;
+       if (!xs->xso.real_dev)
                goto out;
-       }
 
        if (!real_dev->xfrmdev_ops ||
            !real_dev->xfrmdev_ops->xdo_dev_offload_ok ||
-           netif_is_bond_master(real_dev)) {
-               err = false;
+           netif_is_bond_master(real_dev))
                goto out;
-       }
 
-       err = real_dev->xfrmdev_ops->xdo_dev_offload_ok(skb, xs);
+       ok = real_dev->xfrmdev_ops->xdo_dev_offload_ok(skb, xs);
 out:
        rcu_read_unlock();
-       return err;
+       return ok;
 }
 
 static const struct xfrmdev_ops bond_xfrmdev_ops = {