From 892fa17c38b21817996f59dbbc2c8c2efe808152 Mon Sep 17 00:00:00 2001
From: Greg Dietsche <Gregory.Dietsche@cuw.edu>
Date: Thu, 2 Jun 2011 22:24:06 -0500
Subject: [PATCH] --- yaml --- r: 255439 b: refs/heads/master c:
 0c34861e7c66435ab0986509ec20055c402f29d8 h: refs/heads/master i:   255437:
 eff1b1e7e8838dfaaa72ef00fa8c1b2e12fc4b76   255435:
 23a57283700a63f016e1558d11ac6787f5a1ba91   255431:
 1363bb79cb9ff40ab4773668766ef310325267e8   255423:
 34c408d78f02e5735c6d0b15250f8c6adbfcb9bd v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/net/wireless/iwlegacy/iwl-4965-rs.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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) {