diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2008-07-08 02:35:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-08 02:35:55 -0700 |
| commit | b891c5a831b13f74989dcbd7b39d04537b2a05d9 (patch) | |
| tree | b2bc084458948473e31be39edfbc494325f95176 /include | |
| parent | b11c16beb92112885edccc79e17d39c5d218f441 (diff) | |
| download | linux-b891c5a831b13f74989dcbd7b39d04537b2a05d9.tar.gz linux-b891c5a831b13f74989dcbd7b39d04537b2a05d9.tar.bz2 linux-b891c5a831b13f74989dcbd7b39d04537b2a05d9.zip | |
netfilter: nf_conntrack: add allocation flag to nf_conntrack_alloc
ctnetlink does not need to allocate the conntrack entries with GFP_ATOMIC
as its code is executed in user context.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netfilter/nf_conntrack.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index d77dec768dc2..d5d76ec7abb0 100644 --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h @@ -258,7 +258,8 @@ nf_ct_iterate_cleanup(int (*iter)(struct nf_conn *i, void *data), void *data); extern void nf_conntrack_free(struct nf_conn *ct); extern struct nf_conn * nf_conntrack_alloc(const struct nf_conntrack_tuple *orig, - const struct nf_conntrack_tuple *repl); + const struct nf_conntrack_tuple *repl, + gfp_t gfp); /* It's confirmed if it is, or has been in the hash table. */ static inline int nf_ct_is_confirmed(struct nf_conn *ct) |