Re: DragonFly-2.1.1.62.ga48c5 master sys/netinet tcp_input.c tcp_output.c tcp_subr.c tcp_syncache.c tcp_timer.c tcp_timer.h tcp_timer2.h tcp_usrreq.c tcp_var.h

["Sepherosa Ziehau" <sepherosa@xxxxxxxxx>]

On Tue, Dec 16, 2008 at 10:36 PM, Sepherosa Ziehau
<sephe@crater.dragonflybsd.org> wrote:
>
> commit a48c5dd5268dc3f67165670e4e4e550f6fa6816a
> Author: Sepherosa Ziehau <sephe@dragonflybsd.org>
> Date:   Mon Dec 15 22:29:35 2008 +0800
>
>    Restore the semantic of callout_active() testing on tcp timers.
. ..
>
> Summary of changes:
>  sys/netinet/tcp_input.c                   |  133 +++++++++++++++-------------
>  sys/netinet/tcp_output.c                  |   42 +++++----
>  sys/netinet/tcp_subr.c                    |   29 ++++---
>  sys/netinet/tcp_syncache.c                |    3 +-
>  sys/netinet/tcp_timer.c                   |   90 ++++++++++++++------
>  sys/netinet/tcp_timer.h                   |   22 +++--
>  sys/netinet/{tcp_debug.h => tcp_timer2.h} |  113 +++++++++++++------------
>  sys/netinet/tcp_usrreq.c                  |   12 ++-
>  sys/netinet/tcp_var.h                     |   10 +-
>  9 files changed, 263 insertions(+), 191 deletions(-)
>  copy sys/netinet/{tcp_debug.h => tcp_timer2.h} (55%)

The above line is out of my expectation.  I actually added the file using:
git add tcp_timer2.h
git commit
git rebase -i some_commit_id
(merge this commit with the previous one)

Maybe the rebasing is causing problem?

Best Regards,
sephe

>
> http://gitweb.dragonflybsd.org/?p=dragonfly.git;a=commitdiff;h=a48c5dd5268dc3f67165670e4e4e550f6fa6816a

-- 
Live Free or Die