← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-lowlatency/precise-proposed

« back to all changes in this revision

Viewing changes to drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c

  • Committer: Package Import Robot
  • Author(s): Luke Yelavich, Luke Yelavich, Upstream Kernel Changes
  • Date: 2012-04-04 18:49:36 UTC
  • Revision ID: package-import@ubuntu.com-20120404184936-tqu735914muv4wpg
Tags: 3.2.0-22.30
[ Luke Yelavich ]

* [Config] Update configs after rebase against Ubuntu-3.2.0-22.35

[ Upstream Kernel Changes ]

* Low-latency: Rebase against Ubuntu-3.2.0-22.35

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
524
524
                  dm_digtable.cur_igvalue, dm_digtable.pre_igvalue,
525
525
                  dm_digtable.backoff_val));
526
526
 
 
527
        dm_digtable.cur_igvalue += 2;
 
528
        if (dm_digtable.cur_igvalue > 0x3f)
 
529
                dm_digtable.cur_igvalue = 0x3f;
 
530
 
527
531
        if (dm_digtable.pre_igvalue != dm_digtable.cur_igvalue) {
528
532
                rtl_set_bbreg(hw, ROFDM0_XAAGCCORE1, 0x7f,
529
533
                              dm_digtable.cur_igvalue);
1219
1223
                                 ("PreState = %d, CurState = %d\n",
1220
1224
                                  p_ra->pre_ratr_state, p_ra->ratr_state));
1221
1225
 
1222
 
                        rcu_read_lock();
1223
 
                        sta = ieee80211_find_sta(mac->vif, mac->bssid);
 
1226
                        /* Only the PCI card uses sta in the update rate table
 
1227
                         * callback routine */
 
1228
                        if (rtlhal->interface == INTF_PCI) {
 
1229
                                rcu_read_lock();
 
1230
                                sta = ieee80211_find_sta(mac->vif, mac->bssid);
 
1231
                        }
1224
1232
                        rtlpriv->cfg->ops->update_rate_tbl(hw, sta,
1225
1233
                                        p_ra->ratr_state);
1226
1234
 
1227
1235
                        p_ra->pre_ratr_state = p_ra->ratr_state;
1228
 
                        rcu_read_unlock();
 
1236
                        if (rtlhal->interface == INTF_PCI)
 
1237
                                rcu_read_unlock();
1229
1238
                }
1230
1239
        }
1231
1240
}