git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/iommu-2.6
[pandora-kernel.git]
/
net
/
netfilter
/
xt_connmark.c
diff --git
a/net/netfilter/xt_connmark.c
b/net/netfilter/xt_connmark.c
index
b43cfc7
..
7278145
100644
(file)
--- a/
net/netfilter/xt_connmark.c
+++ b/
net/netfilter/xt_connmark.c
@@
-91,7
+91,7
@@
static void connmark_tg_destroy(const struct xt_tgdtor_param *par)
}
static bool
-connmark_mt(const struct sk_buff *skb,
const
struct xt_action_param *par)
+connmark_mt(const struct sk_buff *skb, struct xt_action_param *par)
{
const struct xt_connmark_mtinfo1 *info = par->matchinfo;
enum ip_conntrack_info ctinfo;