|
@@ -357,7 +357,7 @@ static int iwl_hwrate_to_plcp_idx(u32 rate_n_flags)
|
|
|
return idx;
|
|
|
}
|
|
|
|
|
|
- return -1;
|
|
|
+ return IWL_RATE_INVALID;
|
|
|
}
|
|
|
|
|
|
static void rs_rate_scale_perform(struct iwl_mvm *mvm,
|
|
@@ -703,10 +703,8 @@ static int rs_rate_from_ucode_rate(const u32 ucode_rate,
|
|
|
memset(rate, 0, sizeof(*rate));
|
|
|
rate->index = iwl_hwrate_to_plcp_idx(ucode_rate);
|
|
|
|
|
|
- if (rate->index == IWL_RATE_INVALID) {
|
|
|
- rate->index = -1;
|
|
|
+ if (rate->index == IWL_RATE_INVALID)
|
|
|
return -EINVAL;
|
|
|
- }
|
|
|
|
|
|
rate->ant = (ant_msk >> RATE_MCS_ANT_POS);
|
|
|
|
|
@@ -2562,7 +2560,9 @@ static int rs_pretty_print_rate(char *buf, const u32 rate)
|
|
|
int index = iwl_hwrate_to_plcp_idx(rate);
|
|
|
|
|
|
return sprintf(buf, "Legacy | ANT: %s Rate: %s Mbps\n",
|
|
|
- rs_pretty_ant(ant), iwl_rate_mcs[index].mbps);
|
|
|
+ rs_pretty_ant(ant),
|
|
|
+ index == IWL_RATE_INVALID ? "BAD" :
|
|
|
+ iwl_rate_mcs[index].mbps);
|
|
|
}
|
|
|
|
|
|
if (rate & RATE_MCS_VHT_MSK) {
|