--- linux-2.4.27-rc2/net/ipv4/tcp_ipv4.c Thu Jul 1 23:07:49 2004 +++ linux-2.4.27-rc2-fixed/net/ipv4/tcp_ipv4.c Thu Jul 1 23:51:55 2004 @@ -87,16 +87,16 @@ * ALL members must be initialised to prevent gcc-2.7.2.3 miscompilation */ struct tcp_hashinfo __cacheline_aligned tcp_hashinfo = { - __tcp_ehash: NULL, - __tcp_bhash: NULL, - __tcp_bhash_size: 0, - __tcp_ehash_size: 0, - __tcp_listening_hash: { NULL, }, - __tcp_lhash_lock: RW_LOCK_UNLOCKED, - __tcp_lhash_users: ATOMIC_INIT(0), - __tcp_lhash_wait: + .__tcp_ehash = NULL, + .__tcp_bhash = NULL, + .__tcp_bhash_size = 0, + .__tcp_ehash_size = 0, + .__tcp_listening_hash = { NULL, }, + .__tcp_lhash_lock = RW_LOCK_UNLOCKED, + .__tcp_lhash_users = ATOMIC_INIT(0), + .__tcp_lhash_wait = __WAIT_QUEUE_HEAD_INITIALIZER(tcp_hashinfo.__tcp_lhash_wait), - __tcp_portalloc_lock: SPIN_LOCK_UNLOCKED + .__tcp_portalloc_lock = SPIN_LOCK_UNLOCKED }; /* @@ -2290,23 +2290,23 @@ } struct proto tcp_prot = { - name: "TCP", - close: tcp_close, - connect: tcp_v4_connect, - disconnect: tcp_disconnect, - accept: tcp_accept, - ioctl: tcp_ioctl, - init: tcp_v4_init_sock, - destroy: tcp_v4_destroy_sock, - shutdown: tcp_shutdown, - setsockopt: tcp_setsockopt, - getsockopt: tcp_getsockopt, - sendmsg: tcp_sendmsg, - recvmsg: tcp_recvmsg, - backlog_rcv: tcp_v4_do_rcv, - hash: tcp_v4_hash, - unhash: tcp_unhash, - get_port: tcp_v4_get_port, + .name = "TCP", + .close = tcp_close, + .connect = tcp_v4_connect, + .disconnect = tcp_disconnect, + .accept = tcp_accept, + .ioctl = tcp_ioctl, + .init = tcp_v4_init_sock, + .destroy = tcp_v4_destroy_sock, + .shutdown = tcp_shutdown, + .setsockopt = tcp_setsockopt, + .getsockopt = tcp_getsockopt, + .sendmsg = tcp_sendmsg, + .recvmsg = tcp_recvmsg, + .backlog_rcv = tcp_v4_do_rcv, + .hash = tcp_v4_hash, + .unhash = tcp_unhash, + .get_port = tcp_v4_get_port, };