From 394fcccbe1e0b8ef2851a77ae7e572fb55615f96 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 2 Nov 2023 15:27:31 +0000 Subject: [PATCH] Revert "net: phy: mscc: macsec: reject PN update requests" This reverts commit a698195f3a6033bf1efa7ae165d44352296cf1b0 which is commit e0a8c918daa58700609ebd45e3fcd49965be8bbc upstream. It breaks the Android ABI so revert it for now, if it is needed in the future, it can be brought back in an ABI-safe way. Bug: 161946584 Signed-off-by: Greg Kroah-Hartman Change-Id: I8176a4f67c346aa762721515bd797078581eef1b --- drivers/net/phy/mscc/mscc_macsec.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/phy/mscc/mscc_macsec.c b/drivers/net/phy/mscc/mscc_macsec.c index 81fd9bfef527..f81b077618f4 100644 --- a/drivers/net/phy/mscc/mscc_macsec.c +++ b/drivers/net/phy/mscc/mscc_macsec.c @@ -844,9 +844,6 @@ static int vsc8584_macsec_upd_rxsa(struct macsec_context *ctx) struct macsec_flow *flow; int ret; - if (ctx->sa.update_pn) - return -EINVAL; - flow = vsc8584_macsec_find_flow(ctx, MACSEC_INGR); if (IS_ERR(flow)) return PTR_ERR(flow); @@ -900,9 +897,6 @@ static int vsc8584_macsec_upd_txsa(struct macsec_context *ctx) struct macsec_flow *flow; int ret; - if (ctx->sa.update_pn) - return -EINVAL; - flow = vsc8584_macsec_find_flow(ctx, MACSEC_EGR); if (IS_ERR(flow)) return PTR_ERR(flow);