From 6347f67f56b1e9ce24b63e9da7d5f3e1a289c715 Mon Sep 17 00:00:00 2001 From: "Doe, YiCheng" Date: Thu, 10 Mar 2011 14:00:21 -0600 Subject: [PATCH] --- yaml --- r: 234043 b: refs/heads/master c: 4c418ba9695a24917a1fcfa48f7db3fd76337eb7 h: refs/heads/master i: 234041: 694a61995ff25f754cd0136474cf519f4e5c1fe1 234039: 9793d90353bb85a60b04de316f85a70513cf344c v: v3 --- [refs] | 2 +- trunk/drivers/char/ipmi/ipmi_si_intf.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6af69110ceba..c5ab356a5d68 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4afcc10a65bb1f30c4fa1dec2634df74160a8054 +refs/heads/master: 4c418ba9695a24917a1fcfa48f7db3fd76337eb7 diff --git a/trunk/drivers/char/ipmi/ipmi_si_intf.c b/trunk/drivers/char/ipmi/ipmi_si_intf.c index 7855f9f45b8e..62787e30d508 100644 --- a/trunk/drivers/char/ipmi/ipmi_si_intf.c +++ b/trunk/drivers/char/ipmi/ipmi_si_intf.c @@ -900,6 +900,14 @@ static void sender(void *send_info, printk("**Enqueue: %d.%9.9d\n", t.tv_sec, t.tv_usec); #endif + /* + * last_timeout_jiffies is updated here to avoid + * smi_timeout() handler passing very large time_diff + * value to smi_event_handler() that causes + * the send command to abort. + */ + smi_info->last_timeout_jiffies = jiffies; + mod_timer(&smi_info->si_timer, jiffies + SI_TIMEOUT_JIFFIES); if (smi_info->thread)