1 files changed, 3 insertions, 8 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-calib.c b/drivers/net/wireless/iwlwifi/iwl-calib.c
index a5d63672ad39..13180d6ee2f7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-calib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-calib.c
@@ -86,7 +86,7 @@ int iwl_send_calib_results(struct iwl_priv *priv)
 
         struct iwl_host_cmd hcmd = {
                 .id = REPLY_PHY_CALIBRATION_CMD,
-                .meta.flags = CMD_SIZE_HUGE,
+                .flags = CMD_SIZE_HUGE,
         };
 
         for (i = 0; i < IWL_CALIB_MAX; i++) {
@@ -251,12 +251,7 @@ static int iwl_sens_energy_cck(struct iwl_priv *priv,
 
                 /* increase energy threshold (reduce nrg value)
                  *   to decrease sensitivity */
-                if (data->nrg_th_cck >
-                        (ranges->max_nrg_cck + NRG_STEP_CCK))
-                        data->nrg_th_cck = data->nrg_th_cck
-                                                 - NRG_STEP_CCK;
-                else
-                        data->nrg_th_cck = ranges->max_nrg_cck;
+                data->nrg_th_cck = data->nrg_th_cck - NRG_STEP_CCK;
         /* Else if we got fewer than desired, increase sensitivity */
         } else if (false_alarms < min_false_alarms) {
                 data->nrg_curr_state = IWL_FA_TOO_FEW;
@@ -424,7 +419,7 @@ static int iwl_sensitivity_write(struct iwl_priv *priv)
         struct iwl_host_cmd cmd_out = {
                 .id = SENSITIVITY_CMD,
                 .len = sizeof(struct iwl_sensitivity_cmd),
-                .meta.flags = CMD_ASYNC,
+                .flags = CMD_ASYNC,
                 .data = &cmd,
         };