Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / net / wireless / iwlegacy / iwl-4965-rs.c

diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-rs.c b/drivers/net/wireless/iwlegacy/iwl-4965-rs.c
index 31ac672..9b65153 100644 (file)
--- a/drivers/net/wireless/iwlegacy/iwl-4965-rs.c
+++ b/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) {
@@ -2604,7 +2607,7 @@ static ssize_t iwl4965_rs_sta_dbgfs_scale_table_write(struct file *file,
        struct iwl_lq_sta *lq_sta = file->private_data;
        struct iwl_priv *priv;
        char buf[64];
-       int buf_size;
+       size_t buf_size;
        u32 parsed_rate;
        struct iwl_station_priv *sta_priv =
                container_of(lq_sta, struct iwl_station_priv, lq_sta);
@@ -2860,7 +2863,6 @@ static struct rate_control_ops rs_4965_ops = {
 
 int iwl4965_rate_control_register(void)
 {
-       pr_err("Registering 4965 rate control operations\n");
        return ieee80211_rate_control_register(&rs_4965_ops);
 }