← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-mx51/quantal

« back to all changes in this revision

Viewing changes to net/mac80211/rc80211_minstrel.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-3o58a3c1bj7x00rs
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/mac80211/rc80211_minstrel.c
417
417
                        tx_time_single = mr->ack_time + mr->perfect_tx_time;
418
418
 
419
419
                        /* contention window */
420
 
                        tx_time_single += t_slot + min(cw, mp->cw_max);
421
 
                        cw = (cw << 1) | 1;
 
420
                        tx_time_single += (t_slot * cw) >> 1;
 
421
                        cw = min((cw << 1) | 1, mp->cw_max);
422
422
 
423
423
                        tx_time += tx_time_single;
424
424
                        tx_time_cts += tx_time_single + mi->sp_ack_dur;