diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /net/ipx | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'net/ipx')
| -rw-r--r-- | net/ipx/af_ipx.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c index d94e52a69..60427ef6e 100644 --- a/net/ipx/af_ipx.c +++ b/net/ipx/af_ipx.c @@ -1505,7 +1505,7 @@ static const char *ipx_device_name(ipx_interface *intrfc) /* Called from proc fs */ static int ipx_interface_get_info(char *buffer, char **start, off_t offset, - int length, int dummy) + int length) { ipx_interface *i; off_t begin = 0, pos = 0; @@ -1548,8 +1548,7 @@ static int ipx_interface_get_info(char *buffer, char **start, off_t offset, return (len); } -static int ipx_get_info(char *buffer, char **start, off_t offset, - int length, int dummy) +static int ipx_get_info(char *buffer, char **start, off_t offset, int length) { struct sock *s; ipx_interface *i; @@ -1630,8 +1629,7 @@ static int ipx_get_info(char *buffer, char **start, off_t offset, return (len); } -static int ipx_rt_get_info(char *buffer, char **start, off_t offset, - int length, int dummy) +static int ipx_rt_get_info(char *buffer, char **start, off_t offset, int length) { ipx_route *rt; off_t begin = 0, pos = 0; |