diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2009-03-18 22:22:57 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2009-03-18 22:22:57 +0000 |
commit | c84390332f33f83d92dbcccf0a969cb2bf3a84e7 (patch) | |
tree | 44a59c0226c1e7fa82b89940f72fc0f59b9ee366 /package/mac80211/patches/307-rt2x00-Add-PM-support-for-SoC-rt2800pci.patch | |
parent | 227399122b7cf9c95acd0d375c5aef6df2e73b57 (diff) | |
download | upstream-c84390332f33f83d92dbcccf0a969cb2bf3a84e7.tar.gz upstream-c84390332f33f83d92dbcccf0a969cb2bf3a84e7.tar.bz2 upstream-c84390332f33f83d92dbcccf0a969cb2bf3a84e7.zip |
Update compat-wireless to 2009-03-18
Removing of include/net/ieee80211_radiotap.h is not needed, because it is only used by this compat-wireless.
There are changes in that file and compat-wireless needs the newest version.
Some more symbols are deactivated in the default config file, this will make building faster.
The rt2800pci patches are up to date now.
SVN-Revision: 14946
Diffstat (limited to 'package/mac80211/patches/307-rt2x00-Add-PM-support-for-SoC-rt2800pci.patch')
-rw-r--r-- | package/mac80211/patches/307-rt2x00-Add-PM-support-for-SoC-rt2800pci.patch | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/package/mac80211/patches/307-rt2x00-Add-PM-support-for-SoC-rt2800pci.patch b/package/mac80211/patches/307-rt2x00-Add-PM-support-for-SoC-rt2800pci.patch new file mode 100644 index 0000000000..d08e5fecfd --- /dev/null +++ b/package/mac80211/patches/307-rt2x00-Add-PM-support-for-SoC-rt2800pci.patch @@ -0,0 +1,80 @@ +From aef81259a944186a120d51e4462a5f974de99fb8 Mon Sep 17 00:00:00 2001 +From: Ivo van Doorn <IvDoorn@gmail.com> +Date: Sun, 15 Mar 2009 15:37:29 +0100 +Subject: [PATCH] rt2x00: Add PM support for SoC (rt2800pci) + +Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> +--- + drivers/net/wireless/rt2x00/rt2800pci.c | 52 +++++++++++++++++++++++++++++-- + 1 files changed, 49 insertions(+), 3 deletions(-) + +--- a/drivers/net/wireless/rt2x00/rt2800pci.c ++++ b/drivers/net/wireless/rt2x00/rt2800pci.c +@@ -2934,7 +2934,7 @@ exit: + + static int rt2800soc_probe(struct platform_device *pdev) + { +- const struct rt2x00_ops *ops = &rt2800pci_ops; ++ struct rt2x00_ops *ops = (struct rt2x00_ops *)pdev->driver->p; + struct ieee80211_hw *hw; + struct rt2x00_dev *rt2x00dev; + int retval; +@@ -2990,10 +2990,56 @@ static int rt2800soc_remove(struct platf + return 0; + } + ++#ifdef CONFIG_PM ++int rt2x00soc_suspend(struct device *dev, pm_message_t state) ++{ ++ struct ieee80211_hw *hw = dev_get_drvdata(dev); ++ struct rt2x00_dev *rt2x00dev = hw->priv; ++ int retval; ++ ++ retval = rt2x00lib_suspend(rt2x00dev, state); ++ if (retval) ++ return retval; ++ ++ rt2800soc_free_reg(rt2x00dev); ++ ++ return 0; ++} ++ ++int rt2x00soc_resume(struct device *dev) ++{ ++ struct ieee80211_hw *hw = dev_get_drvdata(dev); ++ struct rt2x00_dev *rt2x00dev = hw->priv; ++ int retval; ++ ++ retval = rt2x00soc_alloc_reg(rt2x00dev); ++ if (retval) ++ return retval; ++ ++ retval = rt2x00lib_resume(rt2x00dev); ++ if (retval) ++ goto exit_free_reg; ++ ++ return 0; ++ ++exit_free_reg: ++ rt2x00pci_free_reg(rt2x00dev); ++ ++ return retval; ++} ++#endif /* CONFIG_PM */ ++ + static struct platform_driver rt2800soc_driver = { +- .driver.name = "rt2800_wmac", ++ .driver = { ++ .name = "rt2800_wmac", ++ .owner = THIS_MODULE, ++ .mod_name = KBUILD_MODNAME, ++ .p = &rt2800pci_ops; ++ } + .probe = rt2800soc_probe, +- .remove = rt2800soc_remove, ++ .remove = __devexit_p(rt2800soc_remove), ++ .suspend = rt2x00soc_suspend, ++ .resume = rt2x00soc_resume, + }; + #endif /* CONFIG_RT2800PCI_WISOC */ + |