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
vserver 1.9.3
[linux-2.6.git]
/
net
/
bridge
/
netfilter
/
ebtables.c
diff --git
a/net/bridge/netfilter/ebtables.c
b/net/bridge/netfilter/ebtables.c
index
f765633
..
8352eec
100644
(file)
--- a/
net/bridge/netfilter/ebtables.c
+++ b/
net/bridge/netfilter/ebtables.c
@@
-190,7
+190,7
@@
unsigned int ebt_do_table (unsigned int hook, struct sk_buff **pskb,
base = private->entries;
i = 0;
while (i < nentries) {
base = private->entries;
i = 0;
while (i < nentries) {
- if (ebt_basic_match(point,
(**pskb).mac.ethernet
, in, out))
+ if (ebt_basic_match(point,
eth_hdr(*pskb)
, in, out))
goto letscontinue;
if (EBT_MATCH_ITERATE(point, ebt_do_match, *pskb, in, out) != 0)
goto letscontinue;
if (EBT_MATCH_ITERATE(point, ebt_do_match, *pskb, in, out) != 0)
@@
-902,7
+902,7
@@
static void get_counters(struct ebt_counter *oldcounters,
}
/* replace the table */
}
/* replace the table */
-static int do_replace(void *user, unsigned int len)
+static int do_replace(void
__user
*user, unsigned int len)
{
int ret, i, countersize;
struct ebt_table_info *newinfo;
{
int ret, i, countersize;
struct ebt_table_info *newinfo;
@@
-1217,7
+1217,7
@@
void ebt_unregister_table(struct ebt_table *table)
}
/* userspace just supplied us with counters */
}
/* userspace just supplied us with counters */
-static int update_counters(void *user, unsigned int len)
+static int update_counters(void
__user
*user, unsigned int len)
{
int i, ret;
struct ebt_counter *tmp;
{
int i, ret;
struct ebt_counter *tmp;
@@
-1315,7
+1315,7
@@
static inline int ebt_make_names(struct ebt_entry *e, char *base, char *ubase)
}
/* called with ebt_mutex down */
}
/* called with ebt_mutex down */
-static int copy_everything_to_user(struct ebt_table *t, void *user,
+static int copy_everything_to_user(struct ebt_table *t, void
__user
*user,
int *len, int cmd)
{
struct ebt_replace tmp;
int *len, int cmd)
{
struct ebt_replace tmp;
@@
-1391,7
+1391,7
@@
static int copy_everything_to_user(struct ebt_table *t, void *user,
}
static int do_ebt_set_ctl(struct sock *sk,
}
static int do_ebt_set_ctl(struct sock *sk,
- int cmd, void *user, unsigned int len)
+ int cmd, void
__user
*user, unsigned int len)
{
int ret;
{
int ret;
@@
-1408,7
+1408,7
@@
static int do_ebt_set_ctl(struct sock *sk,
return ret;
}
return ret;
}
-static int do_ebt_get_ctl(struct sock *sk, int cmd, void *user, int *len)
+static int do_ebt_get_ctl(struct sock *sk, int cmd, void
__user
*user, int *len)
{
int ret;
struct ebt_replace tmp;
{
int ret;
struct ebt_replace tmp;