Merge with Linux 2.4.0-test6-pre4.

23 files changed, 38 insertions, 82 deletions

diff --git a/net/bridge/br.c b/net/bridge/br.c
index a569c0c97..3c6c9b72d 100644
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -5,7 +5,7 @@
  *	Authors:
  *	Lennert Buytenhek		<buytenh@gnu.org>
  *
- *	$Id: br.c,v 1.43 2000/05/25 02:21:36 davem Exp $
+ *	$Id: br.c,v 1.44 2000/08/04 06:08:32 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License
@@ -43,7 +43,9 @@ int __init br_init(void)
 	printk(KERN_INFO "NET4: Ethernet Bridge 008 for NET4.0\n");
 
 	br_handle_frame_hook = br_handle_frame;
+#ifdef CONFIG_INET
 	br_ioctl_hook = br_ioctl_deviceless_stub;
+#endif
 #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
 	br_fdb_get_hook = br_fdb_get;
 	br_fdb_put_hook = br_fdb_put;
@@ -60,7 +62,9 @@ static void __br_clear_frame_hook(void)
 
 static void __br_clear_ioctl_hook(void)
 {
+#ifdef CONFIG_INET
 	br_ioctl_hook = NULL;
+#endif	
 }
 
 static void __exit br_deinit(void)
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index b0d989516..f6df3a526 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -407,7 +407,7 @@ static int pneigh_ifdown(struct neigh_table *tbl, struct net_device *dev)
 
 	for (h=0; h<=PNEIGH_HASHMASK; h++) {
 		np = &tbl->phash_buckets[h]; 
-		for (np = &tbl->phash_buckets[h]; (n=*np) != NULL; np = &n->next) {
+		while ((n=*np) != NULL) {
 			if (n->dev == dev || dev == NULL) {
 				*np = n->next;
 				if (tbl->pdestructor)
diff --git a/net/core/sock.c b/net/core/sock.c
index ab8cb89e8..3aaa2fd9a 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -7,7 +7,7 @@
  *		handler for protocols to use and generic option handler.
  *
  *
- * Version:	$Id: sock.c,v 1.95 2000/07/08 00:20:43 davem Exp $
+ * Version:	$Id: sock.c,v 1.96 2000/07/26 01:04:14 davem Exp $
  *
  * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
  *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 81d8ebe80..2dfd1763c 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -1,6 +1,6 @@
 /* linux/net/inet/arp.c
  *
- * Version:	$Id: arp.c,v 1.87 2000/07/07 22:40:35 davem Exp $
+ * Version:	$Id: arp.c,v 1.88 2000/08/02 06:05:02 davem Exp $
  *
  * Copyright (C) 1994 by Florian  La Roche
  *
@@ -122,9 +122,6 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
 
-#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
-static char *ax2asc2(ax25_address *a, char *buf);
-#endif
 
 
 /*
@@ -1015,6 +1012,9 @@ out:
 #ifndef CONFIG_PROC_FS
 static int arp_get_info(char *buffer, char **start, off_t offset, int length) { return 0; }
 #else
+#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
+static char *ax2asc2(ax25_address *a, char *buf);
+#endif
 #define HBUFFERLEN 30
 
 static int arp_get_info(char *buffer, char **start, off_t offset, int length)
@@ -1168,6 +1168,7 @@ void __init arp_init (void)
 }
 
 
+#ifdef CONFIG_PROC_FS
 #if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
 
 /*
@@ -1202,3 +1203,4 @@ char *ax2asc2(ax25_address *a, char *buf)
 }
 
 #endif
+#endif
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index a7f5d3e49..050f5283d 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1,7 +1,7 @@
 /*
  *	NET3	IP device support routines.
  *
- *	Version: $Id: devinet.c,v 1.36 2000/01/09 02:19:46 davem Exp $
+ *	Version: $Id: devinet.c,v 1.37 2000/07/26 01:04:15 davem Exp $
  *
  *		This program is free software; you can redistribute it and/or
  *		modify it under the terms of the GNU General Public License
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 6cac59c91..ee7e44cd2 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -3,7 +3,7 @@
  *	
  *		Alan Cox, <alan@redhat.com>
  *
- *	Version: $Id: icmp.c,v 1.70 2000/06/21 17:16:21 davem Exp $
+ *	Version: $Id: icmp.c,v 1.71 2000/08/02 06:01:48 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License
@@ -669,7 +669,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, unsigned long info)
 	room -= sizeof(struct iphdr) + icmp_param.replyopts.optlen;
 	room -= sizeof(struct icmphdr);
 
-	icmp_param.data_len=(iph->ihl<<2)+(skb_in->tail-(u8*)iph);
+	icmp_param.data_len=(skb_in->tail-(u8*)iph);
 	if (icmp_param.data_len > room)
 		icmp_param.data_len = room;
 	
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 94d64999f..0af9ec321 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -8,7 +8,7 @@
  *	the older version didn't come out right using gcc 2.5.8, the newer one
  *	seems to fall out with gcc 2.6.2.
  *
- *	Version: $Id: igmp.c,v 1.39 2000/06/21 17:17:32 davem Exp $
+ *	Version: $Id: igmp.c,v 1.40 2000/07/26 01:04:16 davem Exp $
  *
  *	Authors:
  *		Alan Cox <Alan.Cox@linux.org>
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index a316401b0..c2a3ea271 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -668,7 +668,6 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
 	int    gre_hlen;
 	u32    dst;
 	int    mtu;
-	int    err;
 
 	if (tunnel->recursion++) {
 		tunnel->stat.collisions++;
@@ -856,26 +855,12 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
 		}
 	}
 
-	iph->tot_len		=	htons(skb->len);
-	ip_select_ident(iph, &rt->u.dst);
-	ip_send_check(iph);
-
 #ifdef CONFIG_NETFILTER
 	nf_conntrack_put(skb->nfct);
 	skb->nfct = NULL;
 #endif
 
-	err = NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL, rt->u.dst.dev,
-		do_ip_send);
-	if(err < 0) {
-		if(net_ratelimit())
-			printk(KERN_ERR "ipgre_tunnel_xmit: ip_send() failed, err=%d\n", -err);
-		skb = NULL;
-		goto tx_error;
-	}
-
-	stats->tx_bytes += skb->len;
-	stats->tx_packets++;
+	IPTUNNEL_XMIT();
 	tunnel->recursion--;
 	return 0;
 
@@ -884,8 +869,7 @@ tx_error_icmp:
 
 tx_error:
 	stats->tx_errors++;
-	if(skb)
-		dev_kfree_skb(skb);
+	dev_kfree_skb(skb);
 	tunnel->recursion--;
 	return 0;
 }
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
index 89b3206f0..53e664444 100644
--- a/net/ipv4/ip_options.c
+++ b/net/ipv4/ip_options.c
@@ -5,7 +5,7 @@
  *
  *		The options processing module for ip.c
  *
- * Version:	$Id: ip_options.c,v 1.18 1999/06/09 08:29:06 davem Exp $
+ * Version:	$Id: ip_options.c,v 1.19 2000/07/26 01:04:17 davem Exp $
  *
  * Authors:	A.N.Kuznetsov
  *		
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index c1c0bb047..22429bb5e 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -5,7 +5,7 @@
  *
  *		The IP to API glue.
  *		
- * Version:	$Id: ip_sockglue.c,v 1.49 2000/07/08 00:20:43 davem Exp $
+ * Version:	$Id: ip_sockglue.c,v 1.50 2000/07/26 01:04:17 davem Exp $
  *
  * Authors:	see ip.c
  *
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 765da5148..f0e9bb5bb 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: ipconfig.c,v 1.33 2000/06/21 17:21:43 davem Exp $
+ *  $Id: ipconfig.c,v 1.34 2000/07/26 01:04:18 davem Exp $
  *
  *  Automatic Configuration of IP -- use BOOTP or RARP or user-supplied
  *  information to configure own IP address and routes.
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 1177033ca..02af22ff9 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -1,7 +1,7 @@
 /*
  *	Linux NET3:	IP/IP protocol decoder. 
  *
- *	Version: $Id: ipip.c,v 1.37 2000/07/07 23:47:45 davem Exp $
+ *	Version: $Id: ipip.c,v 1.38 2000/08/02 06:03:59 davem Exp $
  *
  *	Authors:
  *		Sam Lantinga (slouken@cs.ucdavis.edu)  02/01/95
@@ -534,7 +534,6 @@ static int ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
 	int    max_headroom;			/* The extra header space needed */
 	u32    dst = tiph->daddr;
 	int    mtu;
-	int    err;
 
 	if (tunnel->recursion++) {
 		tunnel->stat.collisions++;
@@ -637,26 +636,12 @@ static int ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
 	if ((iph->ttl = tiph->ttl) == 0)
 		iph->ttl	=	old_iph->ttl;
 
-	iph->tot_len		=	htons(skb->len);
-	ip_select_ident(iph, &rt->u.dst);
-	ip_send_check(iph);
-
 #ifdef CONFIG_NETFILTER
 	nf_conntrack_put(skb->nfct);
 	skb->nfct = NULL;
 #endif
 
-	err = NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL, rt->u.dst.dev,
-		do_ip_send);
-	if(err < 0) {
-		if(net_ratelimit())
-			printk(KERN_ERR "ipip_tunnel_xmit: ip_send() failed, err=%d\n", -err);
-		skb = NULL;
-		goto tx_error;
-	}
-
-	stats->tx_bytes += skb->len;
-	stats->tx_packets++;
+	IPTUNNEL_XMIT();
 	tunnel->recursion--;
 	return 0;
 
@@ -664,8 +649,7 @@ tx_error_icmp:
 	dst_link_failure(skb);
 tx_error:
 	stats->tx_errors++;
-	if(skb)
-		dev_kfree_skb(skb);
+	dev_kfree_skb(skb);
 	tunnel->recursion--;
 	return 0;
 }
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index e9d087d49..dc946b97b 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -9,7 +9,7 @@
  *	as published by the Free Software Foundation; either version
  *	2 of the License, or (at your option) any later version.
  *
- *	Version: $Id: ipmr.c,v 1.53 2000/05/05 02:17:17 davem Exp $
+ *	Version: $Id: ipmr.c,v 1.54 2000/08/02 06:05:16 davem Exp $
  *
  *	Fixes:
  *	Michael Chastain	:	Incorrect size of copying.
@@ -1581,6 +1581,7 @@ int ipmr_get_route(struct sk_buff *skb, struct rtmsg *rtm, int nowait)
 }
 #endif
 
+#ifdef CONFIG_PROC_FS	
 /*
  *	The /proc interfaces to multicast routing /proc/ip_mr_cache /proc/ip_mr_vif
  */
@@ -1711,7 +1712,6 @@ done:
   	return len;
 }
 
-#ifdef CONFIG_PROC_FS	
 #endif	
 
 #ifdef CONFIG_IP_PIMSM_V2
diff --git a/net/ipv4/netfilter/ipfwadm_core.c b/net/ipv4/netfilter/ipfwadm_core.c
index 36614409d..aaaa134ba 100644
--- a/net/ipv4/netfilter/ipfwadm_core.c
+++ b/net/ipv4/netfilter/ipfwadm_core.c
@@ -20,7 +20,7 @@
  *	license in recognition of the original copyright.
  *				-- Alan Cox.
  *
- *	$Id: ipfwadm_core.c,v 1.3 2000/06/09 07:35:49 davem Exp $
+ *	$Id: ipfwadm_core.c,v 1.4 2000/07/26 01:04:21 davem Exp $
  *
  *	Ported from BSD to Linux,
  *		Alan Cox 22/Nov/1994.
diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
index 39cd96ede..d267223ed 100644
--- a/net/ipv4/syncookies.c
+++ b/net/ipv4/syncookies.c
@@ -9,7 +9,7 @@
  *      as published by the Free Software Foundation; either version
  *      2 of the License, or (at your option) any later version.
  * 
- *  $Id: syncookies.c,v 1.11 2000/01/16 05:11:27 davem Exp $
+ *  $Id: syncookies.c,v 1.12 2000/07/26 01:04:19 davem Exp $
  *
  *  Missing: IPv6 support. 
  */
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 1fcf0e255..d9f7dd80d 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -5,7 +5,7 @@
  *
  *		Implementation of the Transmission Control Protocol(TCP).
  *
- * Version:	$Id: tcp_ipv4.c,v 1.209 2000/07/12 03:49:30 davem Exp $
+ * Version:	$Id: tcp_ipv4.c,v 1.210 2000/07/26 01:04:19 davem Exp $
  *
  *		IPv4 specific functions
  *
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 582531a97..62b89af5c 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -5,7 +5,7 @@
  *	Authors:
  *	Pedro Roque		<roque@di.fc.ul.pt>	
  *
- *	$Id: mcast.c,v 1.31 2000/06/21 17:23:54 davem Exp $
+ *	$Id: mcast.c,v 1.32 2000/07/26 01:04:21 davem Exp $
  *
  *	Based on linux/ipv4/igmp.c and linux/ipv4/ip_sockglue.c 
  *
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index b3ba4383d..57430f29f 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -314,7 +314,7 @@ ip6t_do_table(struct sk_buff **pskb,
 
 	/* Initialization */
 	ipv6 = (*pskb)->nh.ipv6h;
-	protohdr = (u_int32_t *)ipv6 + IPV6_HDR_LEN;
+	protohdr = (u_int32_t *)((char *)ipv6 + IPV6_HDR_LEN);
 	datalen = (*pskb)->len - IPV6_HDR_LEN;
 	indev = in ? in->name : nulldevname;
 	outdev = out ? out->name : nulldevname;
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index c8a631f9f..b77f8789d 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.41 2000/07/07 23:47:45 davem Exp $
+ *	$Id: sit.c,v 1.42 2000/08/02 06:03:59 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -440,7 +440,6 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
 	int    mtu;
 	struct in6_addr *addr6;	
 	int addr_type;
-	int err;
 
 	if (tunnel->recursion++) {
 		tunnel->stat.collisions++;
@@ -565,27 +564,12 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
 	if ((iph->ttl = tiph->ttl) == 0)
 		iph->ttl	=	iph6->hop_limit;
 
-	iph->tot_len		=	htons(skb->len);
-	ip_select_ident(iph, &rt->u.dst);
-	ip_send_check(iph);
-
 #ifdef CONFIG_NETFILTER
 	nf_conntrack_put(skb->nfct);
 	skb->nfct = NULL;
 #endif
 
-	err = NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL, rt->u.dst.dev, 
-		do_ip_send);
-	if(err < 0) {
-		if(net_ratelimit())
-			printk(KERN_ERR "ipip6_tunnel_xmit: ip_send() failed, err=%d\n", -err);
-		skb = NULL;
-		goto tx_error;
-	}
-
-	stats->tx_bytes += skb->len;
-	stats->tx_packets++;
-
+	IPTUNNEL_XMIT();
 	tunnel->recursion--;
 	return 0;
 
@@ -593,8 +577,7 @@ tx_error_icmp:
 	dst_link_failure(skb);
 tx_error:
 	stats->tx_errors++;
-	if(skb)
-		dev_kfree_skb(skb);
+	dev_kfree_skb(skb);
 	tunnel->recursion--;
 	return 0;
 }
diff --git a/net/netsyms.c b/net/netsyms.c
index b8226883b..da99c0783 100644
--- a/net/netsyms.c
+++ b/net/netsyms.c
@@ -617,7 +617,6 @@ EXPORT_SYMBOL(ipt_unregister_match);
 EXPORT_SYMBOL(register_gifconf);
 
 EXPORT_SYMBOL(net_call_rx_atomic);
-EXPORT_SYMBOL(softirq_state);
 EXPORT_SYMBOL(softnet_data);
 
 #endif  /* CONFIG_NET */
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index b342c4f14..b0ea8b730 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -5,7 +5,7 @@
  *
  *		PACKET - implements raw packet sockets.
  *
- * Version:	$Id: af_packet.c,v 1.36 2000/07/08 00:20:43 davem Exp $
+ * Version:	$Id: af_packet.c,v 1.37 2000/07/26 01:04:21 davem Exp $
  *
  * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
  *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index 93a4fbb18..d1728e6a6 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -336,7 +336,7 @@ __rpc_sleep_on(struct rpc_wait_queue *q, struct rpc_task *task,
 	} else {
 		task->tk_running = 0;
 		if (task->tk_callback) {
-			printk(KERN_ERR "RPC: %4d overwrites an active callback\n", task->tk_pid);
+			dprintk(KERN_ERR "RPC: %4d overwrites an active callback\n", task->tk_pid);
 			BUG();
 		}
 		task->tk_callback = action;
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 628269f57..1d327267e 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -8,7 +8,7 @@
  *		as published by the Free Software Foundation; either version
  *		2 of the License, or (at your option) any later version.
  *
- * Version:	$Id: af_unix.c,v 1.101 2000/07/06 01:41:46 davem Exp $
+ * Version:	$Id: af_unix.c,v 1.102 2000/07/26 01:04:21 davem Exp $
  *
  * Fixes:
  *		Linus Torvalds	:	Assorted bug cures.