summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Lin <dlin@marvell.com>2016-05-20 17:35:16 +0800
committerDavid Lin <dlin@marvell.com>2016-05-20 17:35:16 +0800
commit7d49296d12b44025278a52c5a26fb1b4236f320f (patch)
tree94dbc8245ad428c2ff8fba82e82cfc138a1663a9
parentc074b732a73cfdfa6f2f5928ba5b55e54fecc85a (diff)
Commit mwlwifi driver 10.3.0.17-20160520-1
Changed wake up period for timer routine from 10 ms to 300 ms. Signed-off-by: David Lin <dlin@marvell.com>
-rw-r--r--dev.h2
-rw-r--r--main.c6
-rw-r--r--sysadpt.h2
3 files changed, 7 insertions, 3 deletions
diff --git a/dev.h b/dev.h
index 8b37b21..4c69dcf 100644
--- a/dev.h
+++ b/dev.h
@@ -27,7 +27,7 @@
#include <net/mac80211.h>
#define MWL_DRV_NAME KBUILD_MODNAME
-#define MWL_DRV_VERSION "10.3.0.17-20160520"
+#define MWL_DRV_VERSION "10.3.0.17-20160520-1"
/* Map to 0x80000000 (Bus control) on BAR0 */
#define MACREG_REG_H2A_INTERRUPT_EVENTS 0x00000C18 /* (From host to ARM) */
diff --git a/main.c b/main.c
index 6a42c71..6a58c6e 100644
--- a/main.c
+++ b/main.c
@@ -547,7 +547,8 @@ static void timer_routine(unsigned long data)
}
spin_unlock_bh(&priv->stream_lock);
- mod_timer(&priv->period_timer, jiffies + msecs_to_jiffies(10));
+ mod_timer(&priv->period_timer, jiffies +
+ msecs_to_jiffies(SYSADPT_TIMER_WAKEUP_TIME));
}
static int mwl_wl_init(struct mwl_priv *priv)
@@ -724,7 +725,8 @@ static int mwl_wl_init(struct mwl_priv *priv)
priv->irq = priv->pdev->irq;
setup_timer(&priv->period_timer, timer_routine, (unsigned long)priv);
- mod_timer(&priv->period_timer, jiffies + msecs_to_jiffies(10));
+ mod_timer(&priv->period_timer, jiffies +
+ msecs_to_jiffies(SYSADPT_TIMER_WAKEUP_TIME));
return rc;
diff --git a/sysadpt.h b/sysadpt.h
index a5d2182..8535a43 100644
--- a/sysadpt.h
+++ b/sysadpt.h
@@ -78,4 +78,6 @@
#define SYSADPT_THERMAL_THROTTLE_MAX 100
+#define SYSADPT_TIMER_WAKEUP_TIME 300 /* ms */
+
#endif /* _SYSADPT_H_ */