diff options
Diffstat (limited to 'patches/network/11-dev-pm-ops.patch')
| -rw-r--r-- | patches/network/11-dev-pm-ops.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/patches/network/11-dev-pm-ops.patch b/patches/network/11-dev-pm-ops.patch index 206f34ea..2df88093 100644 --- a/patches/network/11-dev-pm-ops.patch +++ b/patches/network/11-dev-pm-ops.patch @@ -360,6 +360,39 @@ calls on compat code with only slight modifications. }; module_pci_driver(rtl92se_driver); +--- a/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c ++++ b/drivers/net/wireless/rtlwifi/rtl8723ae/sw.c +@@ -367,21 +367,22 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use + MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); + MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); + +-static const struct dev_pm_ops rtlwifi_pm_ops = { +- .suspend = rtl_pci_suspend, +- .resume = rtl_pci_resume, +- .freeze = rtl_pci_suspend, +- .thaw = rtl_pci_resume, +- .poweroff = rtl_pci_suspend, +- .restore = rtl_pci_resume, +-}; ++compat_pci_suspend(rtl_pci_suspend) ++compat_pci_resume(rtl_pci_resume) ++ ++static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume); + + static struct pci_driver rtl8723ae_driver = { + .name = KBUILD_MODNAME, + .id_table = rtl8723ae_pci_ids, + .probe = rtl_pci_probe, + .remove = rtl_pci_disconnect, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) + .driver.pm = &rtlwifi_pm_ops, ++#elif defined(CONFIG_PM) ++ .suspend = rtl_pci_suspend_compat, ++ .resume = rtl_pci_resume_compat, ++#endif + }; + + module_pci_driver(rtl8723ae_driver); --- a/drivers/net/wireless/p54/p54pci.c +++ b/drivers/net/wireless/p54/p54pci.c @@ -681,14 +681,10 @@ static int p54p_resume(struct device *de |