On Mon, Apr 21, 2014 at 10:00:36AM -0500, minyard@xxxxxxx wrote:
> From: Corey Minyard <cminyard@xxxxxxxxxx>
>
> The OBF timer in KCS was not reset in one situation when error recovery
> was started, resulting in an immediate timeout.
>
> Reported-by: Bodo Stroesser <bstroesser@xxxxxxxxxxxxxx>
> Signed-off-by: Corey Minyard <cminyard@xxxxxxxxxx>
> Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
> ---
> drivers/char/ipmi/ipmi_kcs_sm.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> Upstream change eb6d78ec213e6938559b801421d64714dafcf4b2
>
> Relevant for all stable kernels.
>
Thanks, I'm queuing it for the 3.11 kernel.
Cheers,
--
Luís
> diff --git a/drivers/char/ipmi/ipmi_kcs_sm.c b/drivers/char/ipmi/ipmi_kcs_sm.c
> index 6a4bdc1..8c25f59 100644
> --- a/drivers/char/ipmi/ipmi_kcs_sm.c
> +++ b/drivers/char/ipmi/ipmi_kcs_sm.c
> @@ -251,8 +251,9 @@ static inline int check_obf(struct si_sm_data *kcs, unsigned char status,
> if (!GET_STATUS_OBF(status)) {
> kcs->obf_timeout -= time;
> if (kcs->obf_timeout < 0) {
> - start_error_recovery(kcs, "OBF not ready in time");
> - return 1;
> + kcs->obf_timeout = OBF_RETRY_TIMEOUT;
> + start_error_recovery(kcs, "OBF not ready in time");
> + return 1;
> }
> return 0;
> }
> --
> 1.8.3.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html