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/netrom/nr_route.c | |
parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) |
Merge with Linux 2.3.32.
Diffstat (limited to 'net/netrom/nr_route.c')
-rw-r--r-- | net/netrom/nr_route.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/netrom/nr_route.c b/net/netrom/nr_route.c index 0a3f3a1f3..fd36a887e 100644 --- a/net/netrom/nr_route.c +++ b/net/netrom/nr_route.c @@ -751,8 +751,7 @@ int nr_route_frame(struct sk_buff *skb, ax25_cb *ax25) return (nr_neigh->ax25 != NULL); } -int nr_nodes_get_info(char *buffer, char **start, off_t offset, - int length, int dummy) +int nr_nodes_get_info(char *buffer, char **start, off_t offset, int length) { struct nr_node *nr_node; int len = 0; @@ -801,8 +800,7 @@ int nr_nodes_get_info(char *buffer, char **start, off_t offset, return len; } -int nr_neigh_get_info(char *buffer, char **start, off_t offset, - int length, int dummy) +int nr_neigh_get_info(char *buffer, char **start, off_t offset, int length) { struct nr_neigh *nr_neigh; int len = 0; |