projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NETFILTER]: x_tables: switch xt_match->match to bool
[powerpc.git]
/
net
/
netfilter
/
xt_state.c
diff --git
a/net/netfilter/xt_state.c
b/net/netfilter/xt_state.c
index
df37b91
..
f77f74a
100644
(file)
--- a/
net/netfilter/xt_state.c
+++ b/
net/netfilter/xt_state.c
@@
-10,7
+10,7
@@
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/module.h>
#include <linux/skbuff.h>
-#include <net/netfilter/nf_conntrack
_compat
.h>
+#include <net/netfilter/nf_conntrack.h>
#include <linux/netfilter/x_tables.h>
#include <linux/netfilter/xt_state.h>
#include <linux/netfilter/x_tables.h>
#include <linux/netfilter/xt_state.h>
@@
-20,7
+20,7
@@
MODULE_DESCRIPTION("ip[6]_tables connection tracking state match module");
MODULE_ALIAS("ipt_state");
MODULE_ALIAS("ip6t_state");
MODULE_ALIAS("ipt_state");
MODULE_ALIAS("ip6t_state");
-static
int
+static
bool
match(const struct sk_buff *skb,
const struct net_device *in,
const struct net_device *out,
match(const struct sk_buff *skb,
const struct net_device *in,
const struct net_device *out,
@@
-28,7
+28,7
@@
match(const struct sk_buff *skb,
const void *matchinfo,
int offset,
unsigned int protoff,
const void *matchinfo,
int offset,
unsigned int protoff,
-
int
*hotdrop)
+
bool
*hotdrop)
{
const struct xt_state_info *sinfo = matchinfo;
enum ip_conntrack_info ctinfo;
{
const struct xt_state_info *sinfo = matchinfo;
enum ip_conntrack_info ctinfo;
@@
-36,7
+36,7
@@
match(const struct sk_buff *skb,
if (nf_ct_is_untracked(skb))
statebit = XT_STATE_UNTRACKED;
if (nf_ct_is_untracked(skb))
statebit = XT_STATE_UNTRACKED;
- else if (!nf_ct_get
_ctinfo
(skb, &ctinfo))
+ else if (!nf_ct_get(skb, &ctinfo))
statebit = XT_STATE_INVALID;
else
statebit = XT_STATE_BIT(ctinfo);
statebit = XT_STATE_INVALID;
else
statebit = XT_STATE_BIT(ctinfo);