diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2015-09-15 20:04:17 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-09-17 17:18:37 -0700 |
| commit | 9dff2c966a0a79a4222553a851f17e679fc28a43 (patch) | |
| tree | d86e10d6bf21cfcefd4f6eeaa783d24563456d8f /net/netfilter/nfnetlink_queue_core.c | |
| parent | netfilter: Pass struct net into the netfilter hooks (diff) | |
| download | linux-dev-9dff2c966a0a79a4222553a851f17e679fc28a43.tar.xz linux-dev-9dff2c966a0a79a4222553a851f17e679fc28a43.zip | |
netfilter: Use nf_hook_state.net
Instead of saying "net = dev_net(state->in?state->in:state->out)"
just say "state->net". As that information is now availabe,
much less confusing and much less error prone.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/netfilter/nfnetlink_queue_core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/nfnetlink_queue_core.c b/net/netfilter/nfnetlink_queue_core.c index a5cd6d90b78b..41583e30051b 100644 --- a/net/netfilter/nfnetlink_queue_core.c +++ b/net/netfilter/nfnetlink_queue_core.c @@ -670,8 +670,7 @@ nfqnl_enqueue_packet(struct nf_queue_entry *entry, unsigned int queuenum) struct nfqnl_instance *queue; struct sk_buff *skb, *segs; int err = -ENOBUFS; - struct net *net = dev_net(entry->state.in ? - entry->state.in : entry->state.out); + struct net *net = entry->state.net; struct nfnl_queue_net *q = nfnl_queue_pernet(net); /* rcu_read_lock()ed by nf_hook_slow() */ |