net: macsec: remove the prepare phase when offloading

The hardware offloading in MACsec was initially supported using 2 phases.
This was proposed in the RFC as this could have allowed easier fallback
to the software implementation if the hardware did not support a feature
or had enough entries already. But this fallback wasn't implemented and
might not be a good idea after all. In addition it turned out this logic
didn't mapped well the hardware logic and device drivers were mostly
ignoring the preparation phase.

Let's remove this as it does not offer any advantage and is ignored by
drivers.

Signed-off-by: Antoine Tenart <atenart@kernel.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index 617f850bdb3a43707a3d63770a8a6192d447cbcc..160976929dfed0e5f0938a5e47e91fd089f25c78 100644 (file)
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -1663,22 +1663,9 @@ static int macsec_offload(int (* const func)(struct macsec_context *),
        if (ctx->offload == MACSEC_OFFLOAD_PHY)
                mutex_lock(&ctx->phydev->lock);
 
-       /* Phase I: prepare. The drive should fail here if there are going to be
-        * issues in the commit phase.
-        */
-       ctx->prepare = true;
-       ret = (*func)(ctx);
-       if (ret)
-               goto phy_unlock;
-
-       /* Phase II: commit. This step cannot fail. */
        ctx->prepare = false;
        ret = (*func)(ctx);
-       /* This should never happen: commit is not allowed to fail */
-       if (unlikely(ret))
-               WARN(1, "MACsec offloading commit failed (%d)\n", ret);
 
-phy_unlock:
        if (ctx->offload == MACSEC_OFFLOAD_PHY)
                mutex_unlock(&ctx->phydev->lock);