aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-14 23:22:38 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-14 23:22:38 -0400
commit4c8894980010536915c4f5513ee180e3614aeca9 (patch)
tree07022bfc68eadc372df16adcb98aff2fa044fddd /include/net
parent79d16385c7f287a33ea771c4dbe60ae43f791b49 (diff)
netfilter: Let nf_ct_kill() callers know if del_timer() returned true.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/netfilter/nf_conntrack.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index d5d76ec7abb0..8f5b75734dd0 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -223,23 +223,23 @@ static inline void nf_ct_refresh(struct nf_conn *ct,
223 __nf_ct_refresh_acct(ct, 0, skb, extra_jiffies, 0); 223 __nf_ct_refresh_acct(ct, 0, skb, extra_jiffies, 0);
224} 224}
225 225
226extern void __nf_ct_kill_acct(struct nf_conn *ct, 226extern bool __nf_ct_kill_acct(struct nf_conn *ct,
227 enum ip_conntrack_info ctinfo, 227 enum ip_conntrack_info ctinfo,
228 const struct sk_buff *skb, 228 const struct sk_buff *skb,
229 int do_acct); 229 int do_acct);
230 230
231/* kill conntrack and do accounting */ 231/* kill conntrack and do accounting */
232static inline void nf_ct_kill_acct(struct nf_conn *ct, 232static inline bool nf_ct_kill_acct(struct nf_conn *ct,
233 enum ip_conntrack_info ctinfo, 233 enum ip_conntrack_info ctinfo,
234 const struct sk_buff *skb) 234 const struct sk_buff *skb)
235{ 235{
236 __nf_ct_kill_acct(ct, ctinfo, skb, 1); 236 return __nf_ct_kill_acct(ct, ctinfo, skb, 1);
237} 237}
238 238
239/* kill conntrack without accounting */ 239/* kill conntrack without accounting */
240static inline void nf_ct_kill(struct nf_conn *ct) 240static inline bool nf_ct_kill(struct nf_conn *ct)
241{ 241{
242 __nf_ct_kill_acct(ct, 0, NULL, 0); 242 return __nf_ct_kill_acct(ct, 0, NULL, 0);
243} 243}
244 244
245/* These are for NAT. Icky. */ 245/* These are for NAT. Icky. */