summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpizza <pizza>2008-03-24 18:49:31 +0000
committerpizza <pizza>2008-03-24 18:49:31 +0000
commit6b3a6e94f76ea17ef2b3eeee12332df2c2bc4843 (patch)
tree2a765bcac3189b2bb43212b85a4c6a7ed079c05c
parent676258b9a574dc4fbc115bf0ac4c2caf2cc7506d (diff)
downloadlinux-wlan-ng-6b3a6e94f76ea17ef2b3eeee12332df2c2bc4843.tar.gz
linux-wlan-ng-6b3a6e94f76ea17ef2b3eeee12332df2c2bc4843.tar.bz2
linux-wlan-ng-6b3a6e94f76ea17ef2b3eeee12332df2c2bc4843.zip
A patch from Richard Kennedy:
using round_jiffies for the comms quality timer may help the kernel save power
-rw-r--r--CHANGES1
-rw-r--r--src/include/wlan/wlan_compat.h4
-rw-r--r--src/prism2/driver/prism2sta.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 8af9378..b5e0bc2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -41,6 +41,7 @@
* Intersil Corporation as part of PRISM(R) chipset product development.
*
* --------------------------------------------------------------------
+ - use round_jiffies wherever possible (Richard Kennedy)
- Disallow ioctls from running until the hardware probe function has
finished. (Richard Kennedy)
- Fix userspace scripts to work on Fedora 8 (Chris Rankin)
diff --git a/src/include/wlan/wlan_compat.h b/src/include/wlan/wlan_compat.h
index 55f86fb..428e1cf 100644
--- a/src/include/wlan/wlan_compat.h
+++ b/src/include/wlan/wlan_compat.h
@@ -704,6 +704,10 @@ typedef u32 pm_message_t;
CardServices(ReportError, handle, err)
#endif
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
+#define round_jiffies(a) (a)
+#endif
+
#endif /* __KERNEL__ */
/*=============================================================*/
diff --git a/src/prism2/driver/prism2sta.c b/src/prism2/driver/prism2sta.c
index 68de522..3aea69d 100644
--- a/src/prism2/driver/prism2sta.c
+++ b/src/prism2/driver/prism2sta.c
@@ -2484,7 +2484,7 @@ void prism2sta_commsqual_defer(struct work_struct *data)
/* Reschedule timer */
- mod_timer(&hw->commsqual_timer, jiffies + HZ);
+ mod_timer(&hw->commsqual_timer, round_jiffies(jiffies + HZ));
done:
DBFEXIT;