Commit 4c889498 authored by David S. Miller's avatar David S. Miller
Browse files

netfilter: Let nf_ct_kill() callers know if del_timer() returned true. 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 79d16385

include/net/netfilter/nf_conntrack.h

+10 −10
Original line number Diff line number Diff line
@@ -223,23 +223,23 @@ static inline void nf_ct_refresh(struct nf_conn *ct, 
	__nf_ct_refresh_acct(ct, 0, skb, extra_jiffies, 0);

}



extern void __nf_ct_kill_acct(struct nf_conn *ct,

extern bool __nf_ct_kill_acct(struct nf_conn *ct,

			      enum ip_conntrack_info ctinfo,

			      const struct sk_buff *skb,

			      int do_acct);



/* kill conntrack and do accounting */

static inline void nf_ct_kill_acct(struct nf_conn *ct,

static inline bool nf_ct_kill_acct(struct nf_conn *ct,

				   enum ip_conntrack_info ctinfo,

				   const struct sk_buff *skb)

{

	__nf_ct_kill_acct(ct, ctinfo, skb, 1);

	return __nf_ct_kill_acct(ct, ctinfo, skb, 1);

}



/* kill conntrack without accounting */

static inline void nf_ct_kill(struct nf_conn *ct)

static inline bool nf_ct_kill(struct nf_conn *ct)

{

	__nf_ct_kill_acct(ct, 0, NULL, 0);

	return __nf_ct_kill_acct(ct, 0, NULL, 0);

}



/* These are for NAT.  Icky. */

net/netfilter/nf_conntrack_core.c

+8 −5
Original line number Diff line number Diff line
@@ -848,7 +848,7 @@ void __nf_ct_refresh_acct(struct nf_conn *ct, 
}

EXPORT_SYMBOL_GPL(__nf_ct_refresh_acct);



void __nf_ct_kill_acct(struct nf_conn *ct,

bool __nf_ct_kill_acct(struct nf_conn *ct,

		       enum ip_conntrack_info ctinfo,

		       const struct sk_buff *skb,

		       int do_acct)
@@ -862,8 +862,11 @@ void __nf_ct_kill_acct(struct nf_conn *ct, 
		spin_unlock_bh(&nf_conntrack_lock);

	}

#endif

	if (del_timer(&ct->timeout))

	if (del_timer(&ct->timeout)) {

		ct->timeout.function((unsigned long)ct);

		return true;

	}

	return false;

}

EXPORT_SYMBOL_GPL(__nf_ct_kill_acct);