diff --git a/[refs] b/[refs] index 1fd9d2c9e9d9..d43da19312f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c30c76ee616fffb47cbd9810bfd0a99ce4ddb38 +refs/heads/master: 0c34861e7c66435ab0986509ec20055c402f29d8 diff --git a/trunk/drivers/net/wireless/iwlegacy/iwl-4965-rs.c b/trunk/drivers/net/wireless/iwlegacy/iwl-4965-rs.c index 24d149909ba3..9b65153bdd01 100644 --- a/trunk/drivers/net/wireless/iwlegacy/iwl-4965-rs.c +++ b/trunk/drivers/net/wireless/iwlegacy/iwl-4965-rs.c @@ -2275,6 +2275,9 @@ iwl4965_rs_get_rate(void *priv_r, struct ieee80211_sta *sta, void *priv_sta, if (rate_control_send_low(sta, priv_sta, txrc)) return; + if (!lq_sta) + return; + rate_idx = lq_sta->last_txrate_idx; if (lq_sta->last_rate_n_flags & RATE_MCS_HT_MSK) {