Merge with Linux 2.3.99-pre7 and various other bits.

7 files changed, 23 insertions, 34 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 11a435ab3..4f3113872 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -6,7 +6,7 @@
  *	Pedro Roque		<roque@di.fc.ul.pt>	
  *	Alexey Kuznetsov	<kuznet@ms2.inr.ac.ru>
  *
- *	$Id: addrconf.c,v 1.57 2000/01/18 08:24:21 davem Exp $
+ *	$Id: addrconf.c,v 1.58 2000/05/03 06:37:07 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -84,10 +84,7 @@ rwlock_t addrconf_lock = RW_LOCK_UNLOCKED;
 
 void addrconf_verify(unsigned long);
 
-static struct timer_list addr_chk_timer = {
-	NULL, NULL,
-	0, 0, addrconf_verify
-};
+static struct timer_list addr_chk_timer = { function: addrconf_verify };
 
 static int addrconf_ifdown(struct net_device *dev, int how);
 
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index d458adc93..3edc09a64 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -5,7 +5,7 @@
  *	Authors:
  *	Pedro Roque		<roque@di.fc.ul.pt>	
  *
- *	$Id: ip6_fib.c,v 1.20 2000/01/16 05:11:37 davem Exp $
+ *	$Id: ip6_fib.c,v 1.21 2000/05/03 06:37:07 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -87,12 +87,7 @@ static void fib6_repair_tree(struct fib6_node *fn);
 
 static __u32	rt_sernum	= 0;
 
-static struct timer_list ip6_fib_timer = {
-	NULL, NULL,
-	0,
-	~0UL,
-	fib6_run_gc
-};
+static struct timer_list ip6_fib_timer = { function: fib6_run_gc };
 
 static struct fib6_walker_t fib6_walker_list = {
 	&fib6_walker_list, &fib6_walker_list, 
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 6abd7f4bf..3f2ec7068 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -7,7 +7,7 @@
  *
  *	Adapted from linux/net/ipv4/raw.c
  *
- *	$Id: raw.c,v 1.35 2000/04/25 04:13:34 davem Exp $
+ *	$Id: raw.c,v 1.36 2000/05/03 06:37:07 davem Exp $
  *
  *	Fixes:
  *	Hideaki YOSHIFUJI	:	sin6_scope_id support
@@ -715,15 +715,15 @@ static void get_raw6_sock(struct sock *sp, char *tmpbuf, int i)
 {
 	struct in6_addr *dest, *src;
 	__u16 destp, srcp;
-	int timer_active;
+	int sock_timer_active;
 	unsigned long timer_expires;
 
 	dest  = &sp->net_pinfo.af_inet6.daddr;
 	src   = &sp->net_pinfo.af_inet6.rcv_saddr;
 	destp = 0;
 	srcp  = sp->num;
-	timer_active = (sp->timer.prev != NULL) ? 2 : 0;
-	timer_expires = (timer_active == 2 ? sp->timer.expires : jiffies);
+	sock_timer_active = timer_pending(&sp->timer) ? 2 : 0;
+	timer_expires = (sock_timer_active == 2 ? sp->timer.expires : jiffies);
 	sprintf(tmpbuf,
 		"%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X "
 		"%02X %08X:%08X %02X:%08lX %08X %5d %8d %ld %d %p",
@@ -734,7 +734,7 @@ static void get_raw6_sock(struct sock *sp, char *tmpbuf, int i)
 		dest->s6_addr32[2], dest->s6_addr32[3], destp,
 		sp->state, 
 		atomic_read(&sp->wmem_alloc), atomic_read(&sp->rmem_alloc),
-		timer_active, timer_expires-jiffies, 0,
+		sock_timer_active, timer_expires-jiffies, 0,
 		sp->socket->inode->i_uid, 0,
 		sp->socket ? sp->socket->inode->i_ino : 0,
 		atomic_read(&sp->refcnt), sp);
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index a0a56700a..99f4a702f 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -5,7 +5,7 @@
  *	Authors:
  *	Pedro Roque		<roque@di.fc.ul.pt>	
  *
- *	$Id: reassembly.c,v 1.16 2000/01/09 02:19:51 davem Exp $
+ *	$Id: reassembly.c,v 1.17 2000/05/03 06:37:07 davem Exp $
  *
  *	Based on: net/ipv4/ip_fragment.c
  *
@@ -87,9 +87,6 @@ struct frag_queue {
 
 static struct frag_queue ipv6_frag_queue = {
 	&ipv6_frag_queue, &ipv6_frag_queue,
-	0, {{{0}}}, {{{0}}},
-	{0}, NULL, NULL,
-	0, 0, 0, 0
 };
 
 /* Memory Tracking Functions. */
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 8b8db60d8..0e823a16c 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -6,7 +6,7 @@
  *	Pedro Roque		<roque@di.fc.ul.pt>	
  *	Alexey Kuznetsov	<kuznet@ms2.inr.ac.ru>
  *
- *	$Id: sit.c,v 1.37 2000/03/21 06:14:00 davem Exp $
+ *	$Id: sit.c,v 1.38 2000/05/03 06:37:07 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -58,7 +58,7 @@ static int ipip6_fb_tunnel_init(struct net_device *dev);
 static int ipip6_tunnel_init(struct net_device *dev);
 
 static struct net_device ipip6_fb_tunnel_dev = {
-	NULL, 0x0, 0x0, 0x0, 0x0, 0, 0, 0, 0, 0, NULL, ipip6_fb_tunnel_init,
+	"", 0x0, 0x0, 0x0, 0x0, 0, 0, 0, 0, 0, NULL, ipip6_fb_tunnel_init,
 };
 
 static struct ip_tunnel ipip6_fb_tunnel = {
@@ -173,7 +173,7 @@ struct ip_tunnel * ipip6_tunnel_locate(struct ip_tunnel_parm *parms, int create)
 	dev->priv = (void*)(dev+1);
 	nt = (struct ip_tunnel*)dev->priv;
 	nt->dev = dev;
-	dev->name = nt->parms.name;
+	strcpy(dev->name, nt->parms.name);
 	dev->init = ipip6_tunnel_init;
 	dev->new_style = 1;
 	memcpy(&nt->parms, parms, sizeof(*parms));
@@ -810,7 +810,7 @@ int __init sit_init(void)
 	printk(KERN_INFO "IPv6 over IPv4 tunneling driver\n");
 
 	ipip6_fb_tunnel_dev.priv = (void*)&ipip6_fb_tunnel;
-	ipip6_fb_tunnel_dev.name = ipip6_fb_tunnel.parms.name;
+	strcpy(ipip6_fb_tunnel_dev.name, ipip6_fb_tunnel.parms.name);
 #ifdef MODULE
 	register_netdev(&ipip6_fb_tunnel_dev);
 #else
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 760c77cd8..81c3477ba 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -5,7 +5,7 @@
  *	Authors:
  *	Pedro Roque		<roque@di.fc.ul.pt>	
  *
- *	$Id: tcp_ipv6.c,v 1.123 2000/04/25 04:13:34 davem Exp $
+ *	$Id: tcp_ipv6.c,v 1.124 2000/05/03 06:37:07 davem Exp $
  *
  *	Based on: 
  *	linux/net/ipv4/tcp.c
@@ -1893,14 +1893,14 @@ static void get_tcp6_sock(struct sock *sp, char *tmpbuf, int i)
 	srcp  = ntohs(sp->sport);
 	timer_active	= 0;
 	timer_expires	= (unsigned) -1;
-	if (tp->retransmit_timer.prev != NULL && tp->retransmit_timer.expires < timer_expires) {
+	if (timer_pending(&tp->retransmit_timer) && tp->retransmit_timer.expires < timer_expires) {
 		timer_active	= 1;
 		timer_expires	= tp->retransmit_timer.expires;
-	} else if (tp->probe_timer.prev != NULL && tp->probe_timer.expires < timer_expires) {
+	} else if (timer_pending(&tp->probe_timer) && tp->probe_timer.expires < timer_expires) {
 		timer_active	= 4;
 		timer_expires	= tp->probe_timer.expires;
 	}
-	if (sp->timer.prev != NULL && sp->timer.expires < timer_expires) {
+	if (timer_pending(&sp->timer) && sp->timer.expires < timer_expires) {
 		timer_active	= 2;
 		timer_expires	= sp->timer.expires;
 	}
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 5665c3225..4b3bf084b 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -7,7 +7,7 @@
  *
  *	Based on linux/ipv4/udp.c
  *
- *	$Id: udp.c,v 1.52 2000/04/25 04:13:34 davem Exp $
+ *	$Id: udp.c,v 1.53 2000/05/03 06:37:07 davem Exp $
  *
  *	Fixes:
  *	Hideaki YOSHIFUJI	:	sin6_scope_id support
@@ -901,15 +901,15 @@ static void get_udp6_sock(struct sock *sp, char *tmpbuf, int i)
 {
 	struct in6_addr *dest, *src;
 	__u16 destp, srcp;
-	int timer_active;
+	int sock_timer_active;
 	unsigned long timer_expires;
 
 	dest  = &sp->net_pinfo.af_inet6.daddr;
 	src   = &sp->net_pinfo.af_inet6.rcv_saddr;
 	destp = ntohs(sp->dport);
 	srcp  = ntohs(sp->sport);
-	timer_active = (sp->timer.prev != NULL) ? 2 : 0;
-	timer_expires = (timer_active == 2 ? sp->timer.expires : jiffies);
+	sock_timer_active = timer_pending(&sp->timer) ? 2 : 0;
+	timer_expires = (sock_timer_active == 2 ? sp->timer.expires : jiffies);
 	sprintf(tmpbuf,
 		"%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X "
 		"%02X %08X:%08X %02X:%08lX %08X %5d %8d %ld %d %p",
@@ -920,7 +920,7 @@ static void get_udp6_sock(struct sock *sp, char *tmpbuf, int i)
 		dest->s6_addr32[2], dest->s6_addr32[3], destp,
 		sp->state, 
 		atomic_read(&sp->wmem_alloc), atomic_read(&sp->rmem_alloc),
-		timer_active, timer_expires-jiffies, 0,
+		sock_timer_active, timer_expires-jiffies, 0,
 		sp->socket->inode->i_uid, 0,
 		sp->socket ? sp->socket->inode->i_ino : 0,
 		atomic_read(&sp->refcnt), sp);