[ Please bear with me; the hotel I'm staying in has a ... really broken
firewall/proxy, so I'm reduced to webmail at the moment... ]

>> Log Message:
>> - Change callout_setfunc() to require that the callout handle is already
>>   initialized.  Update the txp(4) to compensate.
>> - Statically initialize the TCP timer callout handles in the tcpcb
>>   template.  We still use callout_setfunc(), but that call is now much
>>   less expensive.  Add a comment that the compiler is likely to unroll
>>   the loop (so don't sweat that it's there).
>
> How about to implement callout_setfunc() as a macro or inline?

That's probably a good idea, actually.

--thorpej