aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-04-03 16:31:01 -0400
committerDavid S. Miller <davem@davemloft.net>2015-04-04 12:25:22 -0400
commit1d1de89b9a4746f1dd055a3b8d073dd2f962a3b6 (patch)
tree84465aaf839096b56d542b37da24cadbd861eb16 /include
parentnetfilter: Create and use nf_hook_state. (diff)
downloadlinux-dev-1d1de89b9a4746f1dd055a3b8d073dd2f962a3b6.tar.xz
linux-dev-1d1de89b9a4746f1dd055a3b8d073dd2f962a3b6.zip
netfilter: Use nf_hook_state in nf_queue_entry.
That way we don't have to reinstantiate another nf_hook_state on the stack of the nf_reinject() path. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/netfilter/nf_queue.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/net/netfilter/nf_queue.h b/include/net/netfilter/nf_queue.h
index 84a53d780306..d81d584157e1 100644
--- a/include/net/netfilter/nf_queue.h
+++ b/include/net/netfilter/nf_queue.h
@@ -12,12 +12,8 @@ struct nf_queue_entry {
unsigned int id;
struct nf_hook_ops *elem;
- u_int8_t pf;
+ struct nf_hook_state state;
u16 size; /* sizeof(entry) + saved route keys */
- unsigned int hook;
- struct net_device *indev;
- struct net_device *outdev;
- int (*okfn)(struct sk_buff *);
/* extra space to store route keys */
};