Merge patch into tcp_ipv4.c
Finish merge of Luca's patch