diff --git a/CHANGELOG.md b/CHANGELOG.md
index 072dcef..3b86d88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v2.1.1] 2022-04-06
+
+### Fixed
+
+* [radio] Order of the parameters in `lr11xx_radio_set_rssi_calibration()` function
+
 ## [v2.1.0] 2022-03-28
 
 ### Added
diff --git a/src/lr11xx_driver_version.h b/src/lr11xx_driver_version.h
index aba3e22..24e06e4 100644
--- a/src/lr11xx_driver_version.h
+++ b/src/lr11xx_driver_version.h
@@ -56,7 +56,7 @@ extern "C" {
 
 #define LR11XX_DRIVER_VERSION_MAJOR 2
 #define LR11XX_DRIVER_VERSION_MINOR 1
-#define LR11XX_DRIVER_VERSION_PATCH 0
+#define LR11XX_DRIVER_VERSION_PATCH 1
 
 /*
  * -----------------------------------------------------------------------------
diff --git a/src/lr11xx_radio.c b/src/lr11xx_radio.c
index 4210945..e191510 100644
--- a/src/lr11xx_radio.c
+++ b/src/lr11xx_radio.c
@@ -806,17 +806,17 @@ lr11xx_status_t lr11xx_radio_set_rssi_calibration( const void*
     const uint8_t cbuffer[LR11XX_RADIO_SET_RSSI_CALIBRATION_LENGTH] = {
         ( uint8_t ) ( LR11XX_RADIO_SET_RSSI_CALIBRATION_OC >> 8 ),
         ( uint8_t ) ( LR11XX_RADIO_SET_RSSI_CALIBRATION_OC >> 0 ),
-        ( uint8_t ) ( ( ( rssi_cal_table->gain_tune.g11 & 0x0F ) << 4 ) + ( rssi_cal_table->gain_tune.g10 & 0x0F ) ),
-        ( uint8_t ) ( ( ( rssi_cal_table->gain_tune.g9 & 0x0F ) << 4 ) + ( rssi_cal_table->gain_tune.g8 & 0x0F ) ),
-        ( uint8_t ) ( ( ( rssi_cal_table->gain_tune.g7 & 0x0F ) << 4 ) + ( rssi_cal_table->gain_tune.g6 & 0x0F ) ),
         ( uint8_t ) ( ( ( rssi_cal_table->gain_tune.g5 & 0x0F ) << 4 ) + ( rssi_cal_table->gain_tune.g4 & 0x0F ) ),
-        ( uint8_t ) ( ( ( rssi_cal_table->gain_tune.g13hp6 & 0x0F ) << 4 ) +
-                      ( rssi_cal_table->gain_tune.g13hp5 & 0x0F ) ),
-        ( uint8_t ) ( ( ( rssi_cal_table->gain_tune.g13hp4 & 0x0F ) << 4 ) +
-                      ( rssi_cal_table->gain_tune.g13hp3 & 0x0F ) ),
+        ( uint8_t ) ( ( ( rssi_cal_table->gain_tune.g7 & 0x0F ) << 4 ) + ( rssi_cal_table->gain_tune.g6 & 0x0F ) ),
+        ( uint8_t ) ( ( ( rssi_cal_table->gain_tune.g9 & 0x0F ) << 4 ) + ( rssi_cal_table->gain_tune.g8 & 0x0F ) ),
+        ( uint8_t ) ( ( ( rssi_cal_table->gain_tune.g11 & 0x0F ) << 4 ) + ( rssi_cal_table->gain_tune.g10 & 0x0F ) ),
+        ( uint8_t ) ( ( ( rssi_cal_table->gain_tune.g13 & 0x0F ) << 4 ) + ( rssi_cal_table->gain_tune.g12 & 0x0F ) ),
         ( uint8_t ) ( ( ( rssi_cal_table->gain_tune.g13hp2 & 0x0F ) << 4 ) +
                       ( rssi_cal_table->gain_tune.g13hp1 & 0x0F ) ),
-        ( uint8_t ) ( ( ( rssi_cal_table->gain_tune.g13 & 0x0F ) << 4 ) + ( rssi_cal_table->gain_tune.g12 & 0x0F ) ),
+        ( uint8_t ) ( ( ( rssi_cal_table->gain_tune.g13hp4 & 0x0F ) << 4 ) +
+                      ( rssi_cal_table->gain_tune.g13hp3 & 0x0F ) ),
+        ( uint8_t ) ( ( ( rssi_cal_table->gain_tune.g13hp6 & 0x0F ) << 4 ) +
+                      ( rssi_cal_table->gain_tune.g13hp5 & 0x0F ) ),
         ( uint8_t ) ( rssi_cal_table->gain_tune.g13hp7 & 0x0F ),
         ( uint8_t ) ( rssi_cal_table->gain_offset >> 8 ),
         ( uint8_t ) ( rssi_cal_table->gain_offset >> 0 ),
diff --git a/src/lr11xx_radio_types.h b/src/lr11xx_radio_types.h
index ed1820e..6f5c58d 100644
--- a/src/lr11xx_radio_types.h
+++ b/src/lr11xx_radio_types.h
@@ -537,22 +537,22 @@ typedef struct lr11xx_radio_rssi_calibration_table_s
 {
     struct
     {
-        uint8_t g11;
-        uint8_t g10;
-        uint8_t g9;
-        uint8_t g8;
-        uint8_t g7;
-        uint8_t g6;
-        uint8_t g5;
         uint8_t g4;
-        uint8_t g13hp6;
-        uint8_t g13hp5;
-        uint8_t g13hp4;
-        uint8_t g13hp3;
-        uint8_t g13hp2;
-        uint8_t g13hp1;
-        uint8_t g13;
+        uint8_t g5;
+        uint8_t g6;
+        uint8_t g7;
+        uint8_t g8;
+        uint8_t g9;
+        uint8_t g10;
+        uint8_t g11;
         uint8_t g12;
+        uint8_t g13;
+        uint8_t g13hp1;
+        uint8_t g13hp2;
+        uint8_t g13hp3;
+        uint8_t g13hp4;
+        uint8_t g13hp5;
+        uint8_t g13hp6;
         uint8_t g13hp7;
     } gain_tune;  //!< Used to set gain tune value for RSSI calibration