git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
net
/
ipv4
/
netfilter
/
ip_tables.c
diff --git
a/net/ipv4/netfilter/ip_tables.c
b/net/ipv4/netfilter/ip_tables.c
index
1c12071
..
66316da
100644
(file)
--- a/
net/ipv4/netfilter/ip_tables.c
+++ b/
net/ipv4/netfilter/ip_tables.c
@@
-942,7
+942,7
@@
get_counters(const struct ipt_table_info *t,
static int
copy_entries_to_user(unsigned int total_size,
struct ipt_table *table,
static int
copy_entries_to_user(unsigned int total_size,
struct ipt_table *table,
- void *userptr)
+ void
__user
*userptr)
{
unsigned int off, num, countersize;
struct ipt_entry *e;
{
unsigned int off, num, countersize;
struct ipt_entry *e;
@@
-1020,7
+1020,7
@@
copy_entries_to_user(unsigned int total_size,
static int
get_entries(const struct ipt_get_entries *entries,
static int
get_entries(const struct ipt_get_entries *entries,
- struct ipt_get_entries *uptr)
+ struct ipt_get_entries
__user
*uptr)
{
int ret;
struct ipt_table *t;
{
int ret;
struct ipt_table *t;
@@
-1047,7
+1047,7
@@
get_entries(const struct ipt_get_entries *entries,
}
static int
}
static int
-do_replace(void *user, unsigned int len)
+do_replace(void
__user
*user, unsigned int len)
{
int ret;
struct ipt_replace tmp;
{
int ret;
struct ipt_replace tmp;
@@
-1173,7
+1173,7
@@
add_counter_to_entry(struct ipt_entry *e,
}
static int
}
static int
-do_add_counters(void *user, unsigned int len)
+do_add_counters(void
__user
*user, unsigned int len)
{
unsigned int i;
struct ipt_counters_info tmp, *paddc;
{
unsigned int i;
struct ipt_counters_info tmp, *paddc;
@@
-1221,7
+1221,7
@@
do_add_counters(void *user, unsigned int len)
}
static int
}
static int
-do_ipt_set_ctl(struct sock *sk, int cmd, void *user, unsigned int len)
+do_ipt_set_ctl(struct sock *sk, int cmd, void
__user
*user, unsigned int len)
{
int ret;
{
int ret;
@@
-1246,7
+1246,7
@@
do_ipt_set_ctl(struct sock *sk, int cmd, void *user, unsigned int len)
}
static int
}
static int
-do_ipt_get_ctl(struct sock *sk, int cmd, void *user, int *len)
+do_ipt_get_ctl(struct sock *sk, int cmd, void
__user
*user, int *len)
{
int ret;
{
int ret;