diff mbox series

[v2,net-next,17/17] net: atlantic: add XPN handling

Message ID 20200325125246.987-18-irusskikh@marvell.com
State New
Headers show
Series [v2,net-next,01/17] net: introduce the MACSEC netdev feature | expand

Commit Message

Igor Russkikh March 25, 2020, 12:52 p.m. UTC 
From: Mark Starovoytov <mstarovoitov@marvell.com>

This patch adds XPN handling.
Our driver doesn't support XPN, but we should still update a couple
of places in the code, because the size of 'next_pn' field has
changed.

Signed-off-by: Mark Starovoytov <mstarovoitov@marvell.com>
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
---
 drivers/net/ethernet/aquantia/atlantic/aq_macsec.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_macsec.c b/drivers/net/ethernet/aquantia/atlantic/aq_macsec.c
index 4bd283ba0d56..0b3e234a54aa 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_macsec.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_macsec.c
@@ -452,6 +452,9 @@  static int aq_mdo_add_secy(struct macsec_context *ctx)
 	u32 txsc_idx;
 	int ret = 0;
 
+	if (secy->xpn)
+		return -EOPNOTSUPP;
+
 	sc_sa = sc_sa_from_num_an(MACSEC_NUM_AN);
 	if (sc_sa == aq_macsec_sa_sc_not_used)
 		return -EINVAL;
@@ -556,6 +559,7 @@  static int aq_update_txsa(struct aq_nic_s *nic, const unsigned int sc_idx,
 			  const struct macsec_tx_sa *tx_sa,
 			  const unsigned char *key, const unsigned char an)
 {
+	const u32 next_pn = tx_sa->next_pn_halves.lower;
 	struct aq_mss_egress_sakey_record key_rec;
 	const unsigned int sa_idx = sc_idx | an;
 	struct aq_mss_egress_sa_record sa_rec;
@@ -565,7 +569,7 @@  static int aq_update_txsa(struct aq_nic_s *nic, const unsigned int sc_idx,
 	memset(&sa_rec, 0, sizeof(sa_rec));
 	sa_rec.valid = tx_sa->active;
 	sa_rec.fresh = 1;
-	sa_rec.next_pn = tx_sa->next_pn;
+	sa_rec.next_pn = next_pn;
 
 	ret = aq_mss_set_egress_sa_record(hw, &sa_rec, sa_idx);
 	if (ret)
@@ -889,6 +893,7 @@  static int aq_update_rxsa(struct aq_nic_s *nic, const unsigned int sc_idx,
 			  const unsigned char *key, const unsigned char an)
 {
 	struct aq_mss_ingress_sakey_record sa_key_record;
+	const u32 next_pn = rx_sa->next_pn_halves.lower;
 	struct aq_mss_ingress_sa_record sa_record;
 	struct aq_hw_s *hw = nic->aq_hw;
 	const int sa_idx = sc_idx | an;
@@ -897,7 +902,7 @@  static int aq_update_rxsa(struct aq_nic_s *nic, const unsigned int sc_idx,
 	memset(&sa_record, 0, sizeof(sa_record));
 	sa_record.valid = rx_sa->active;
 	sa_record.fresh = 1;
-	sa_record.next_pn = rx_sa->next_pn;
+	sa_record.next_pn = next_pn;
 
 	ret = aq_mss_set_ingress_sa_record(hw, &sa_record, sa_idx);
 	if (ret)