Merge with Linux 2.3.32.

8 files changed, 14 insertions, 17 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 157fe6c4e..d7192096b 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1540,7 +1540,7 @@ static void addrconf_dad_completed(struct inet6_ifaddr *ifp)
 
 #ifdef CONFIG_PROC_FS
 static int iface_proc_info(char *buffer, char **start, off_t offset,
-			   int length, int dummy)
+			   int length)
 {
 	struct inet6_ifaddr *ifp;
 	int i;
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 1e056d2ea..638c1e79d 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -73,11 +73,11 @@ extern struct proto_ops inet6_dgram_ops;
 /* IPv6 procfs goodies... */
 
 #ifdef CONFIG_PROC_FS
-extern int raw6_get_info(char *, char **, off_t, int, int);
-extern int tcp6_get_info(char *, char **, off_t, int, int);
-extern int udp6_get_info(char *, char **, off_t, int, int);
-extern int afinet6_get_info(char *, char **, off_t, int, int);
-extern int afinet6_get_snmp(char *, char **, off_t, int, int);
+extern int raw6_get_info(char *, char **, off_t, int);
+extern int tcp6_get_info(char *, char **, off_t, int);
+extern int udp6_get_info(char *, char **, off_t, int);
+extern int afinet6_get_info(char *, char **, off_t, int);
+extern int afinet6_get_snmp(char *, char **, off_t, int);
 #endif
 
 #ifdef CONFIG_SYSCTL
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index dab819da8..9c3cce05d 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1110,7 +1110,7 @@ int ndisc_rcv(struct sk_buff *skb, unsigned long len)
 
 #ifdef CONFIG_PROC_FS
 #ifndef CONFIG_RTNETLINK
-int ndisc_get_info(char *buffer, char **start, off_t offset, int length, int dummy)
+static int ndisc_get_info(char *buffer, char **start, off_t offset, int length)
 {
 	int len=0;
 	off_t pos=0;
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index 09845703b..2e2603668 100644
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -26,7 +26,7 @@
 #include <net/transp_v6.h>
 #include <net/ipv6.h>
 
-int afinet6_get_info(char *buffer, char **start, off_t offset, int length, int dummy)
+int afinet6_get_info(char *buffer, char **start, off_t offset, int length)
 {
 	int len = 0;
 	len += sprintf(buffer+len, "TCP6: inuse %d highest %d\n",
@@ -122,8 +122,7 @@ struct snmp6_item
 };
 
 
-int afinet6_get_snmp(char *buffer, char **start, off_t offset, int length,
-		     int dummy)
+int afinet6_get_snmp(char *buffer, char **start, off_t offset, int length)
 {
 	int len = 0;
 	int i;
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index b13ccd164..d52c6a129 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -715,7 +715,7 @@ static void get_raw6_sock(struct sock *sp, char *tmpbuf, int i)
 		atomic_read(&sp->refcnt), sp);
 }
 
-int raw6_get_info(char *buffer, char **start, off_t offset, int length, int dummy)
+int raw6_get_info(char *buffer, char **start, off_t offset, int length)
 {
 	int len = 0, num = 0, i;
 	off_t pos = 0;
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 431ef0c85..dddc12bc9 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1809,8 +1809,7 @@ static int rt6_info_route(struct rt6_info *rt, void *p_arg)
 	return 0;
 }
 
-static int rt6_proc_info(char *buffer, char **start, off_t offset, int length,
-			 int dummy)
+static int rt6_proc_info(char *buffer, char **start, off_t offset, int length)
 {
 	struct rt6_proc_arg arg;
 	arg.buffer = buffer;
@@ -1839,8 +1838,7 @@ static int rt6_proc_info(char *buffer, char **start, off_t offset, int length,
 
 extern struct rt6_statistics rt6_stats;
 
-static int rt6_proc_stats(char *buffer, char **start, off_t offset, int length,
-			  int dummy)
+static int rt6_proc_stats(char *buffer, char **start, off_t offset, int length)
 {
 	int len;
 
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index a80b1153b..8f7fbb7ba 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1988,7 +1988,7 @@ static void get_timewait6_sock(struct tcp_tw_bucket *tw, char *tmpbuf, int i)
 #define LINE_LEN 190
 #define LINE_FMT "%-190s\n"
 
-int tcp6_get_info(char *buffer, char **start, off_t offset, int length, int dummy)
+int tcp6_get_info(char *buffer, char **start, off_t offset, int length)
 {
 	int len = 0, num = 0, i;
 	off_t begin, pos = 0;
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index e167c7e78..6c2777b32 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -936,7 +936,7 @@ static void get_udp6_sock(struct sock *sp, char *tmpbuf, int i)
 		atomic_read(&sp->refcnt), sp);
 }
 
-int udp6_get_info(char *buffer, char **start, off_t offset, int length, int dummy)
+int udp6_get_info(char *buffer, char **start, off_t offset, int length)
 {
 	int len = 0, num = 0, i;
 	off_t pos = 0;