Hi Greg,
* Greg Dietsche <Gregory.Dietsche@xxxxxxx> [2011-06-02 21:06:10 -0500]:
> lq_sta has other null checks in this funcion.
> assuming they are correct, this additional null check
> should be added too.
>
> Signed-off-by: Greg Dietsche <Gregory.Dietsche@xxxxxxx>
> ---
> drivers/net/wireless/iwlegacy/iwl-4965-rs.c | 66 ++++++++++++++-------------
> 1 files changed, 34 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-rs.c b/drivers/net/wireless/iwlegacy/iwl-4965-rs.c
> index 24d1499..a475aac 100644
> --- a/drivers/net/wireless/iwlegacy/iwl-4965-rs.c
> +++ b/drivers/net/wireless/iwlegacy/iwl-4965-rs.c
> @@ -2275,40 +2275,42 @@ iwl4965_rs_get_rate(void *priv_r, struct ieee80211_sta *sta, void *priv_sta,
> if (rate_control_send_low(sta, priv_sta, txrc))
> return;
>
> - rate_idx = lq_sta->last_txrate_idx;
> -
> - if (lq_sta->last_rate_n_flags & RATE_MCS_HT_MSK) {
> - rate_idx -= IWL_FIRST_OFDM_RATE;
> - /* 6M and 9M shared same MCS index */
> - rate_idx = (rate_idx > 0) ? (rate_idx - 1) : 0;
> - if (iwl4965_rs_extract_rate(lq_sta->last_rate_n_flags) >=
> - IWL_RATE_MIMO2_6M_PLCP)
> - rate_idx = rate_idx + MCS_INDEX_PER_STREAM;
> - info->control.rates[0].flags = IEEE80211_TX_RC_MCS;
> - if (lq_sta->last_rate_n_flags & RATE_MCS_SGI_MSK)
> - info->control.rates[0].flags |=
> - IEEE80211_TX_RC_SHORT_GI;
> - if (lq_sta->last_rate_n_flags & RATE_MCS_DUP_MSK)
> - info->control.rates[0].flags |=
> - IEEE80211_TX_RC_DUP_DATA;
> - if (lq_sta->last_rate_n_flags & RATE_MCS_HT40_MSK)
> - info->control.rates[0].flags |=
> - IEEE80211_TX_RC_40_MHZ_WIDTH;
> - if (lq_sta->last_rate_n_flags & RATE_MCS_GF_MSK)
> - info->control.rates[0].flags |=
> - IEEE80211_TX_RC_GREEN_FIELD;
> - } else {
> - /* Check for invalid rates */
> - if ((rate_idx < 0) || (rate_idx >= IWL_RATE_COUNT_LEGACY) ||
> - ((sband->band == IEEE80211_BAND_5GHZ) &&
> - (rate_idx < IWL_FIRST_OFDM_RATE)))
> - rate_idx = rate_lowest_index(sband, sta);
> - /* On valid 5 GHz rate, adjust index */
> - else if (sband->band == IEEE80211_BAND_5GHZ)
> + if (lq_sta) {
Then do
if (!lq_sta)
return;
to avoid an exatra level of indentation.
--
Gustavo F. Padovan
http://profusion.mobi
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
