Commit 73f9407b authored by Roi Dayan's avatar Roi Dayan Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: Move nf_ct_offload_timeout to header file 



To be used by callers from other modules.

[ Rename DAY to NF_CT_DAY to avoid possible symbol name pollution
  issue --Pablo ]

Signed-off-by: default avatarRoi Dayan <roid@mellanox.com>
Reviewed-by: default avatarOz Shlomo <ozsh@mellanox.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 2ef740da

include/net/netfilter/nf_conntrack.h

+12 −0
Original line number Diff line number Diff line
@@ -279,6 +279,18 @@ static inline bool nf_ct_should_gc(const struct nf_conn *ct) 
	       !nf_ct_is_dying(ct);

}



#define	NF_CT_DAY	(86400 * HZ)



/* Set an arbitrary timeout large enough not to ever expire, this save

 * us a check for the IPS_OFFLOAD_BIT from the packet path via

 * nf_ct_is_expired().

 */

static inline void nf_ct_offload_timeout(struct nf_conn *ct)

{

	if (nf_ct_expires(ct) < NF_CT_DAY / 2)

		ct->timeout = nfct_time_stamp + NF_CT_DAY;

}



struct kernel_param;



int nf_conntrack_set_hashsize(const char *val, const struct kernel_param *kp);

net/netfilter/nf_conntrack_core.c

+0 −12
Original line number Diff line number Diff line
@@ -1344,18 +1344,6 @@ static bool gc_worker_can_early_drop(const struct nf_conn *ct) 
	return false;

}



#define	DAY	(86400 * HZ)



/* Set an arbitrary timeout large enough not to ever expire, this save

 * us a check for the IPS_OFFLOAD_BIT from the packet path via

 * nf_ct_is_expired().

 */

static void nf_ct_offload_timeout(struct nf_conn *ct)

{

	if (nf_ct_expires(ct) < DAY / 2)

		ct->timeout = nfct_time_stamp + DAY;

}



static void gc_worker(struct work_struct *work)

{

	unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u);