projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netfilter: Pass priv instead of nf_hook_ops to netfilter hooks
[deliverable/linux.git]
/
net
/
ipv4
/
netfilter
/
iptable_nat.c
diff --git
a/net/ipv4/netfilter/iptable_nat.c
b/net/ipv4/netfilter/iptable_nat.c
index 8ff63ac1f0d6ff559165a58ec427477da77853f5..3a2e4d830a0b2ae7a75d6e962fa17f35e4b07bc4 100644
(file)
--- a/
net/ipv4/netfilter/iptable_nat.c
+++ b/
net/ipv4/netfilter/iptable_nat.c
@@
-28,7
+28,7
@@
static const struct xt_table nf_nat_ipv4_table = {
.af = NFPROTO_IPV4,
};
.af = NFPROTO_IPV4,
};
-static unsigned int iptable_nat_do_chain(
const struct nf_hook_ops *ops
,
+static unsigned int iptable_nat_do_chain(
void *priv
,
struct sk_buff *skb,
const struct nf_hook_state *state,
struct nf_conn *ct)
struct sk_buff *skb,
const struct nf_hook_state *state,
struct nf_conn *ct)
@@
-36,32
+36,32
@@
static unsigned int iptable_nat_do_chain(const struct nf_hook_ops *ops,
return ipt_do_table(skb, state, state->net->ipv4.nat_table);
}
return ipt_do_table(skb, state, state->net->ipv4.nat_table);
}
-static unsigned int iptable_nat_ipv4_fn(
const struct nf_hook_ops *ops
,
+static unsigned int iptable_nat_ipv4_fn(
void *priv
,
struct sk_buff *skb,
const struct nf_hook_state *state)
{
struct sk_buff *skb,
const struct nf_hook_state *state)
{
- return nf_nat_ipv4_fn(
ops
, skb, state, iptable_nat_do_chain);
+ return nf_nat_ipv4_fn(
priv
, skb, state, iptable_nat_do_chain);
}
}
-static unsigned int iptable_nat_ipv4_in(
const struct nf_hook_ops *ops
,
+static unsigned int iptable_nat_ipv4_in(
void *priv
,
struct sk_buff *skb,
const struct nf_hook_state *state)
{
struct sk_buff *skb,
const struct nf_hook_state *state)
{
- return nf_nat_ipv4_in(
ops
, skb, state, iptable_nat_do_chain);
+ return nf_nat_ipv4_in(
priv
, skb, state, iptable_nat_do_chain);
}
}
-static unsigned int iptable_nat_ipv4_out(
const struct nf_hook_ops *ops
,
+static unsigned int iptable_nat_ipv4_out(
void *priv
,
struct sk_buff *skb,
const struct nf_hook_state *state)
{
struct sk_buff *skb,
const struct nf_hook_state *state)
{
- return nf_nat_ipv4_out(
ops
, skb, state, iptable_nat_do_chain);
+ return nf_nat_ipv4_out(
priv
, skb, state, iptable_nat_do_chain);
}
}
-static unsigned int iptable_nat_ipv4_local_fn(
const struct nf_hook_ops *ops
,
+static unsigned int iptable_nat_ipv4_local_fn(
void *priv
,
struct sk_buff *skb,
const struct nf_hook_state *state)
{
struct sk_buff *skb,
const struct nf_hook_state *state)
{
- return nf_nat_ipv4_local_fn(
ops
, skb, state, iptable_nat_do_chain);
+ return nf_nat_ipv4_local_fn(
priv
, skb, state, iptable_nat_do_chain);
}
static struct nf_hook_ops nf_nat_ipv4_ops[] __read_mostly = {
}
static struct nf_hook_ops nf_nat_ipv4_ops[] __read_mostly = {
This page took
0.026075 seconds
and
5
git commands to generate.