diff -Nru --exclude *~ linux-nfpom1/net/ipv4/netfilter/ip_conntrack_irc.c linux-rc2/net/ipv4/netfilter/ip_conntrack_irc.c --- linux-nfpom1/net/ipv4/netfilter/ip_conntrack_irc.c Fri Feb 22 12:23:52 2002 +++ linux-rc2/net/ipv4/netfilter/ip_conntrack_irc.c Fri Feb 22 12:24:09 2002 @@ -1,8 +1,8 @@ -/* IRC extension for IP connection tracking, Version 1.20 - * (C) 2000-2001 by Harald Welte +/* IRC extension for IP connection tracking, Version 1.21 + * (C) 2000-2002 by Harald Welte * based on RR's ip_conntrack_ftp.c * - * ip_conntrack_irc.c,v 1.20 2001/12/06 07:42:10 laforge Exp + * ip_conntrack_irc.c,v 1.21 2002/02/05 14:49:26 laforge Exp * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -112,9 +112,9 @@ struct ip_ct_irc *info = &ct->help.ct_irc_info; - memset(&mask, 0, sizeof(struct ip_conntrack_tuple)); - mask.dst.u.tcp.port = 0xFFFF; - mask.dst.protonum = 0xFFFF; + mask = ((struct ip_conntrack_tuple) + { { 0, { 0 } }, + { 0xFFFFFFFF, { 0xFFFF }, 0xFFFF }}); DEBUGP("entered\n"); /* Can't track connections formed before we registered */