git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://dev.medozas.de/linux
[safe/jmp/linux-2.6]
/
net
/
bridge
/
netfilter
/
ebt_mark_m.c
diff --git
a/net/bridge/netfilter/ebt_mark_m.c
b/net/bridge/netfilter/ebt_mark_m.c
index
e4366c0
..
d98baef
100644
(file)
--- a/
net/bridge/netfilter/ebt_mark_m.c
+++ b/
net/bridge/netfilter/ebt_mark_m.c
@@
-13,7
+13,7
@@
#include <linux/netfilter_bridge/ebt_mark_m.h>
static bool
#include <linux/netfilter_bridge/ebt_mark_m.h>
static bool
-ebt_mark_mt(const struct sk_buff *skb,
const struct xt_match
_param *par)
+ebt_mark_mt(const struct sk_buff *skb,
struct xt_action
_param *par)
{
const struct ebt_mark_m_info *info = par->matchinfo;
{
const struct ebt_mark_m_info *info = par->matchinfo;