diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-07 07:24:21 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-07 07:24:21 -0400 |
| commit | b1bc81a0ef86b86fa410dd303d84c8c7bd09a64d (patch) | |
| tree | a0d2e6dd179e5d057776edd0ed865bc744dfa54d /drivers/net/wireless/rt2x00/rt2500pci.c | |
| parent | a93958ac980f0ce594ad90657ecbc595ff157a40 (diff) | |
| parent | 0c0c9e7076b69f93678e4ec711e2bf237398e623 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2500pci.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2500pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c index f95cb646f85a..08b30d01e67d 100644 --- a/drivers/net/wireless/rt2x00/rt2500pci.c +++ b/drivers/net/wireless/rt2x00/rt2500pci.c | |||
| @@ -569,7 +569,7 @@ static void rt2500pci_config_ps(struct rt2x00_dev *rt2x00dev, | |||
| 569 | if (state == STATE_SLEEP) { | 569 | if (state == STATE_SLEEP) { |
| 570 | rt2x00pci_register_read(rt2x00dev, CSR20, ®); | 570 | rt2x00pci_register_read(rt2x00dev, CSR20, ®); |
| 571 | rt2x00_set_field32(®, CSR20_DELAY_AFTER_TBCN, | 571 | rt2x00_set_field32(®, CSR20_DELAY_AFTER_TBCN, |
| 572 | (libconf->conf->beacon_int - 20) * 16); | 572 | (rt2x00dev->beacon_int - 20) * 16); |
| 573 | rt2x00_set_field32(®, CSR20_TBCN_BEFORE_WAKEUP, | 573 | rt2x00_set_field32(®, CSR20_TBCN_BEFORE_WAKEUP, |
| 574 | libconf->conf->listen_interval - 1); | 574 | libconf->conf->listen_interval - 1); |
| 575 | 575 | ||