aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/600-p54usb_without_pm_support.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2009-05-01 13:43:12 +0000
committerHauke Mehrtens <hauke@openwrt.org>2009-05-01 13:43:12 +0000
commit1769a158354ee49008097bb741cc3a31bda66c0d (patch)
treed6243c804c302dcd159ddf3745d614ceb300b6f4 /package/mac80211/patches/600-p54usb_without_pm_support.patch
parent5dd85a35e3251f47408e7939aadc041c92cff45e (diff)
downloadupstream-1769a158354ee49008097bb741cc3a31bda66c0d.tar.gz
upstream-1769a158354ee49008097bb741cc3a31bda66c0d.tar.bz2
upstream-1769a158354ee49008097bb741cc3a31bda66c0d.zip
[mac80211] Update to compat-wireless-2009-05-01
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15536 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/600-p54usb_without_pm_support.patch')
-rw-r--r--package/mac80211/patches/600-p54usb_without_pm_support.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/package/mac80211/patches/600-p54usb_without_pm_support.patch b/package/mac80211/patches/600-p54usb_without_pm_support.patch
new file mode 100644
index 0000000000..9fa8915c4f
--- /dev/null
+++ b/package/mac80211/patches/600-p54usb_without_pm_support.patch
@@ -0,0 +1,16 @@
+Fixes compile error when CONFIG_PM=n is set
+
+--- a/drivers/net/wireless/p54/p54usb.c
++++ b/drivers/net/wireless/p54/p54usb.c
+@@ -919,9 +919,11 @@ static int __devinit p54u_probe(struct u
+ priv->common.open = p54u_open;
+ priv->common.stop = p54u_stop;
+ if (recognized_pipes < P54U_PIPE_NUMBER) {
++#ifdef CONFIG_PM
+ /* ISL3887 needs a full reset on resume */
+ udev->reset_resume = 1;
+ err = p54u_device_reset(dev);
++#endif
+
+ priv->hw_type = P54U_3887;
+ dev->extra_tx_headroom += sizeof(struct lm87_tx_hdr);