Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
net
/
ipv4
/
netfilter
/
iptable_raw.c
diff --git
a/kernel/net/ipv4/netfilter/iptable_raw.c
b/kernel/net/ipv4/netfilter/iptable_raw.c
index
0356e6d
..
1ba0281
100644
(file)
--- a/
kernel/net/ipv4/netfilter/iptable_raw.c
+++ b/
kernel/net/ipv4/netfilter/iptable_raw.c
@@
-20,19
+20,16
@@
static const struct xt_table packet_raw = {
/* The work comes in here from netfilter.c. */
static unsigned int
/* The work comes in here from netfilter.c. */
static unsigned int
-iptable_raw_hook(
const struct nf_hook_ops *ops
, struct sk_buff *skb,
+iptable_raw_hook(
void *priv
, struct sk_buff *skb,
const struct nf_hook_state *state)
{
const struct nf_hook_state *state)
{
- const struct net *net;
-
- if (ops->hooknum == NF_INET_LOCAL_OUT &&
+ if (state->hook == NF_INET_LOCAL_OUT &&
(skb->len < sizeof(struct iphdr) ||
ip_hdrlen(skb) < sizeof(struct iphdr)))
/* root is playing with raw sockets. */
return NF_ACCEPT;
(skb->len < sizeof(struct iphdr) ||
ip_hdrlen(skb) < sizeof(struct iphdr)))
/* root is playing with raw sockets. */
return NF_ACCEPT;
- net = dev_net(state->in ? state->in : state->out);
- return ipt_do_table(skb, ops->hooknum, state, net->ipv4.iptable_raw);
+ return ipt_do_table(skb, state, state->net->ipv4.iptable_raw);
}
static struct nf_hook_ops *rawtable_ops __read_mostly;
}
static struct nf_hook_ops *rawtable_ops __read_mostly;