From 316250b759c1e3854ba3b90fd5d82f448e38a8a5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 2 Nov 2023 15:27:32 +0000 Subject: [PATCH] Revert "net: macsec: indicate next pn update when offloading" This reverts commit 0d86ad068c3e30bc0ce78c9bc4e42bb25a47bd32 which is commit 0412cc846a1ef38697c3f321f9b174da91ecd3b5 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 Change-Id: Ib59e80373b59f1e88b36f676ddd3a34832af7dfd Signed-off-by: Greg Kroah-Hartman --- drivers/net/macsec.c | 2 -- include/net/macsec.h | 1 - 2 files changed, 3 deletions(-) diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c index 81453e84b641..578f470e9fad 100644 --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -2384,7 +2384,6 @@ static int macsec_upd_txsa(struct sk_buff *skb, struct genl_info *info) ctx.sa.assoc_num = assoc_num; ctx.sa.tx_sa = tx_sa; - ctx.sa.update_pn = !!prev_pn.full64; ctx.secy = secy; ret = macsec_offload(ops->mdo_upd_txsa, &ctx); @@ -2478,7 +2477,6 @@ static int macsec_upd_rxsa(struct sk_buff *skb, struct genl_info *info) ctx.sa.assoc_num = assoc_num; ctx.sa.rx_sa = rx_sa; - ctx.sa.update_pn = !!prev_pn.full64; ctx.secy = secy; ret = macsec_offload(ops->mdo_upd_rxsa, &ctx); diff --git a/include/net/macsec.h b/include/net/macsec.h index 65c93959c2dc..5b9c61c4d3a6 100644 --- a/include/net/macsec.h +++ b/include/net/macsec.h @@ -257,7 +257,6 @@ struct macsec_context { struct macsec_secy *secy; struct macsec_rx_sc *rx_sc; struct { - bool update_pn; unsigned char assoc_num; u8 key[MACSEC_MAX_KEY_LEN]; union {