From owner-svn-src-head@freebsd.org  Thu Jul 21 08:11:59 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9C5B6BA0F75;
 Thu, 21 Jul 2016 08:11:59 +0000 (UTC) (envelope-from hps@selasky.org)
Received: from mail.turbocat.net (heidi.turbocat.net [88.198.202.214])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 645CA1DE5;
 Thu, 21 Jul 2016 08:11:59 +0000 (UTC) (envelope-from hps@selasky.org)
Received: from laptop015.home.selasky.org (unknown [62.141.129.119])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (No client certificate requested)
 by mail.turbocat.net (Postfix) with ESMTPSA id 096321FE024;
 Thu, 21 Jul 2016 10:11:56 +0200 (CEST)
Subject: Re: svn commit: r303096 - head/sys/kern
To: Gleb Smirnoff <glebius@FreeBSD.org>, src-committers@freebsd.org,
 svn-src-all@freebsd.org, svn-src-head@freebsd.org
References: <201607201644.u6KGiM3e007023@repo.freebsd.org>
 <6162a195-05ae-0095-cf9e-115df497e577@selasky.org>
From: Hans Petter Selasky <hps@selasky.org>
Message-ID: <900304a4-aec9-2404-fbfc-4183997fe4ce@selasky.org>
Date: Thu, 21 Jul 2016 10:15:59 +0200
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101
 Thunderbird/45.0
MIME-Version: 1.0
In-Reply-To: <6162a195-05ae-0095-cf9e-115df497e577@selasky.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Jul 2016 08:11:59 -0000

On 07/21/16 10:12, Hans Petter Selasky wrote:
> On 07/20/16 18:44, Gleb Smirnoff wrote:
>> Author: glebius
>> Date: Wed Jul 20 16:44:22 2016
>> New Revision: 303096
>> URL: https://svnweb.freebsd.org/changeset/base/303096
>>
>> Log:
>>   Revert r303037. It re-introduces the panic with TCP timers.
>>
>>   Agreed by:    rrs, re (gjb)
>>
>> Modified:
>>   head/sys/kern/kern_timeout.c
>>
>
> Hi,
>
> The panic with TCP timers can also be fixes calling callout_stop() twice
> instead of once.

s/fixes/fixed

>
> First time out call it it will return 1,0,-1. Second time only 0 or -1.

First call will return 1,0,-1 and second time it will return 0 or -1, 
which is what you are looking for.

--HPS