diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 12:03:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 12:03:55 -0400 |
| commit | 46ee9645094ad1eb5b4888882ecaa1fb87dcd2a3 (patch) | |
| tree | d0a48e993568b6a2415cfc21fc06eaa2fd886429 /net | |
| parent | fa5312d9e87e7222c6c384c4e930dc149bc1178d (diff) | |
| parent | 25f3a5a2854dce8b8413fd24cc9d5b9e3632be54 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM: PM QOS update fix
Freezer / cgroup freezer: Update stale locking comments
PM / platform_bus: Allow runtime PM by default
i2c: Fix bus-level power management callbacks
PM QOS update
PM / Hibernate: Fix block_io.c printk warning
PM / Hibernate: Group swap ops
PM / Hibernate: Move the first_sector out of swsusp_write
PM / Hibernate: Separate block_io
PM / Hibernate: Snapshot cleanup
FS / libfs: Implement simple_write_to_buffer
PM / Hibernate: document open(/dev/snapshot) side effects
PM / Runtime: Add sysfs debug files
PM: Improve device power management document
PM: Update device power management document
PM: Allow runtime_suspend methods to call pm_schedule_suspend()
PM: pm_wakeup - switch to using bool
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/mlme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 875c8dec940a..88f95e7bab49 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
| @@ -495,7 +495,7 @@ void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency) | |||
| 495 | s32 beaconint_us; | 495 | s32 beaconint_us; |
| 496 | 496 | ||
| 497 | if (latency < 0) | 497 | if (latency < 0) |
| 498 | latency = pm_qos_requirement(PM_QOS_NETWORK_LATENCY); | 498 | latency = pm_qos_request(PM_QOS_NETWORK_LATENCY); |
| 499 | 499 | ||
| 500 | beaconint_us = ieee80211_tu_to_usec( | 500 | beaconint_us = ieee80211_tu_to_usec( |
| 501 | found->vif.bss_conf.beacon_int); | 501 | found->vif.bss_conf.beacon_int); |