From de7204afe99338dff26c3c32343c341ed6fb8675 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 15 Aug 2010 14:28:10 +0200 Subject: [PATCH] compat-wireless: make patches apply again. Signed-off-by: Hauke Mehrtens --- patches/28-pm-qos-params.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/patches/28-pm-qos-params.patch b/patches/28-pm-qos-params.patch index cd8fecad35b6..e28d7a7b61cc 100644 --- a/patches/28-pm-qos-params.patch +++ b/patches/28-pm-qos-params.patch @@ -58,8 +58,8 @@ little wierd. /* We have to signal any supplicant if we are disassociating */ if (associated) @@ -6669,8 +6686,16 @@ static int __init ipw2100_init(void) - if (ret) - goto out; + printk(KERN_INFO DRV_NAME ": %s, %s\n", DRV_DESCRIPTION, DRV_VERSION); + printk(KERN_INFO DRV_NAME ": %s\n", DRV_COPYRIGHT); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) pm_qos_add_request(&ipw2100_pm_qos_req, PM_QOS_CPU_DMA_LATENCY, @@ -71,10 +71,10 @@ little wierd. + pm_qos_add_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100", + PM_QOS_DEFAULT_VALUE); +#endif - #ifdef CONFIG_IPW2100_DEBUG - ipw2100_debug_level = debug; - ret = driver_create_file(&ipw2100_pci_driver.driver, -@@ -6692,7 +6717,13 @@ static void __exit ipw2100_exit(void) + + ret = pci_register_driver(&ipw2100_pci_driver); + if (ret) +@@ -6697,7 +6722,13 @@ static void __exit ipw2100_exit(void) &driver_attr_debug_level); #endif pci_unregister_driver(&ipw2100_pci_driver); @@ -104,7 +104,7 @@ little wierd. found->vif.bss_conf.beacon_int); --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c -@@ -514,7 +514,11 @@ static int ieee80211_scan_state_decision +@@ -500,7 +500,11 @@ static int ieee80211_scan_state_decision bad_latency = time_after(jiffies + ieee80211_scan_get_channel_time(next_chan), local->leave_oper_channel_time + -- 2.30.2