diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 02:59:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 02:59:00 +0000 |
| commit | 1fcb7623bc138d780101d7a70cfe29b11f7c67ef (patch) | |
| tree | e1ec9bb6aa19db16a405fb4393e2a90c38b4c75d /net | |
| parent | 458fe58677afb17219d864e100131728038b4f1b (diff) | |
Merge with Linux 2.4.0-test3-pre5. 64-bit kernel are still not
-Werror clean.
Diffstat (limited to 'net')
| -rw-r--r-- | net/802/tr.c | 2 | ||||
| -rw-r--r-- | net/decnet/dn_dev.c | 4 | ||||
| -rw-r--r-- | net/ipv4/tcp_timer.c | 2 | ||||
| -rw-r--r-- | net/unix/af_unix.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/net/802/tr.c b/net/802/tr.c index 316cc6a22..cb6604698 100644 --- a/net/802/tr.c +++ b/net/802/tr.c @@ -457,7 +457,7 @@ static void rif_check_expire(unsigned long dummy) */ #ifndef CONFIG_PROC_FS -static int rif_get_info(char *buffer,char **start, off_t offset, int length) {} +static int rif_get_info(char *buffer,char **start, off_t offset, int length) { return 0;} #else static int rif_get_info(char *buffer,char **start, off_t offset, int length) { diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c index bc9e2cb48..76bc28648 100644 --- a/net/decnet/dn_dev.c +++ b/net/decnet/dn_dev.c @@ -1172,8 +1172,8 @@ static int decnet_dev_get_info(char *buffer, char **start, off_t offset, int len dn_db->parms.blksize, dn_db->parms.priority, dn_db->parms.state, dn_db->parms.name, - dn_db->router ? dn_addr2asc(dn_eth2dn(dn_db->router->primary_key), router_buf) : "", - dn_db->peer ? dn_addr2asc(dn_eth2dn(dn_db->peer->primary_key), peer_buf) : ""); + dn_db->router ? dn_addr2asc(dn_ntohs(*(dn_address *)dn_db->router->primary_key), router_buf) : "", + dn_db->peer ? dn_addr2asc(dn_ntohs(*(dn_address *)dn_db->peer->primary_key), peer_buf) : ""); pos = begin + len; diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index de4722707..4ed38175b 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -5,7 +5,7 @@ * * Implementation of the Transmission Control Protocol(TCP). * - * Version: $Id: tcp_timer.c,v 1.76 2000/05/03 06:37:07 davem Exp $ + * Version: $Id: tcp_timer.c,v 1.77 2000/06/30 10:18:38 davem Exp $ * * Authors: Ross Biro, <bir7@leland.Stanford.Edu> * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG> diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index f0165c28b..a04b85cfa 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.100 2000/06/26 23:20:27 davem Exp $ + * Version: $Id: af_unix.c,v 1.101 2000/07/06 01:41:46 davem Exp $ * * Fixes: * Linus Torvalds : Assorted bug cures. |