From 4728b8a4e58aa979d1e4036643c25f68e8ccd557 Mon Sep 17 00:00:00 2001
From: Adrian-Stefan Mares <adrianm97@gmail.com>
Date: Tue, 17 May 2022 21:23:21 +0200
Subject: [PATCH] Update last downlink frame counter while updating downlink
 frame counters

---
 src/mac/LoRaMacCrypto.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mac/LoRaMacCrypto.c b/src/mac/LoRaMacCrypto.c
index 1969a227d..51dac6def 100644
--- a/src/mac/LoRaMacCrypto.c
+++ b/src/mac/LoRaMacCrypto.c
@@ -682,15 +682,12 @@ static LoRaMacCryptoStatus_t GetLastFcntDown( FCntIdentifier_t fCntID, uint32_t*
     {
         case N_FCNT_DOWN:
             *lastDown = CryptoNvm->FCntList.NFCntDown;
-            CryptoNvm->LastDownFCnt = CryptoNvm->FCntList.NFCntDown;
             break;
         case A_FCNT_DOWN:
             *lastDown = CryptoNvm->FCntList.AFCntDown;
-            CryptoNvm->LastDownFCnt = CryptoNvm->FCntList.AFCntDown;
             break;
         case FCNT_DOWN:
             *lastDown = CryptoNvm->FCntList.FCntDown;
-            CryptoNvm->LastDownFCnt = CryptoNvm->FCntList.FCntDown;
             break;
 #if ( LORAMAC_MAX_MC_CTX > 0 )
         case MC_FCNT_DOWN_0:
@@ -759,12 +756,15 @@ static void UpdateFCntDown( FCntIdentifier_t fCntID, uint32_t currentDown )
     {
         case N_FCNT_DOWN:
             CryptoNvm->FCntList.NFCntDown = currentDown;
+            CryptoNvm->LastDownFCnt = currentDown;
             break;
         case A_FCNT_DOWN:
             CryptoNvm->FCntList.AFCntDown = currentDown;
+            CryptoNvm->LastDownFCnt = currentDown;
             break;
         case FCNT_DOWN:
             CryptoNvm->FCntList.FCntDown = currentDown;
+            CryptoNvm->LastDownFCnt = currentDown;
             break;
 #if ( LORAMAC_MAX_MC_CTX > 0 )
         case MC_FCNT_DOWN_0: