diff options
| author | Kristian Evensen <kristian.evensen@gmail.com> | 2014-12-24 03:57:11 -0500 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-01-08 06:16:58 -0500 |
| commit | ae406bd0572be97a46d72e8a5e97c33c3168388c (patch) | |
| tree | ef38fbf17987ebd01b60bb401d81ff34d9a0ac98 | |
| parent | 866476f323465a8afef10b14b48d5136bf5c51fe (diff) | |
netfilter: conntrack: Remove nf_ct_conntrack_flush_report
The only user of nf_ct_conntrack_flush_report() was ctnetlink_del_conntrack().
After adding support for flushing connections with a given mark, this function
is no longer called.
Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | include/net/netfilter/nf_conntrack.h | 2 | ||||
| -rw-r--r-- | net/netfilter/nf_conntrack_core.c | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index f0daed2b54d1..74f271a172dd 100644 --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h | |||
| @@ -191,8 +191,6 @@ __nf_conntrack_find(struct net *net, u16 zone, | |||
| 191 | int nf_conntrack_hash_check_insert(struct nf_conn *ct); | 191 | int nf_conntrack_hash_check_insert(struct nf_conn *ct); |
| 192 | bool nf_ct_delete(struct nf_conn *ct, u32 pid, int report); | 192 | bool nf_ct_delete(struct nf_conn *ct, u32 pid, int report); |
| 193 | 193 | ||
| 194 | void nf_conntrack_flush_report(struct net *net, u32 portid, int report); | ||
| 195 | |||
| 196 | bool nf_ct_get_tuplepr(const struct sk_buff *skb, unsigned int nhoff, | 194 | bool nf_ct_get_tuplepr(const struct sk_buff *skb, unsigned int nhoff, |
| 197 | u_int16_t l3num, struct nf_conntrack_tuple *tuple); | 195 | u_int16_t l3num, struct nf_conntrack_tuple *tuple); |
| 198 | bool nf_ct_invert_tuplepr(struct nf_conntrack_tuple *inverse, | 196 | bool nf_ct_invert_tuplepr(struct nf_conntrack_tuple *inverse, |
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index da58cd4f2cb7..5a6990bc5a5b 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c | |||
| @@ -1426,12 +1426,6 @@ void nf_ct_free_hashtable(void *hash, unsigned int size) | |||
| 1426 | } | 1426 | } |
| 1427 | EXPORT_SYMBOL_GPL(nf_ct_free_hashtable); | 1427 | EXPORT_SYMBOL_GPL(nf_ct_free_hashtable); |
| 1428 | 1428 | ||
| 1429 | void nf_conntrack_flush_report(struct net *net, u32 portid, int report) | ||
| 1430 | { | ||
| 1431 | nf_ct_iterate_cleanup(net, kill_all, NULL, portid, report); | ||
| 1432 | } | ||
| 1433 | EXPORT_SYMBOL_GPL(nf_conntrack_flush_report); | ||
| 1434 | |||
| 1435 | static int untrack_refs(void) | 1429 | static int untrack_refs(void) |
| 1436 | { | 1430 | { |
| 1437 | int cnt = 0, cpu; | 1431 | int cnt = 0, cpu; |
