merged changes to include/linux/tcp.h