History

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 ]

Roi Dayan committed 6 years ago

Commit 73f94071 parent 2ef740d2 files · +12 −12Browse files

Unified · Split

2 files
  1. include/net/netfilter/nf_conntrack.h +12 −0
  2. net/netfilter/nf_conntrack_core.c +0 −12
include/net/netfilter/nf_conntrack.h+12−0
@@ -279,6 +279,18 @@ static inline bool nf_ct_should_gc(const struct nf_conn *ct) · 278 unmodified lines
279 !nf_ct_is_dying(ct);279 !nf_ct_is_dying(ct);
280}280}
281 281
282#define NF_CT_DAY (86400 * HZ)
283
284/* Set an arbitrary timeout large enough not to ever expire, this save
285 * us a check for the IPS_OFFLOAD_BIT from the packet path via
286 * nf_ct_is_expired().
287 */
288static inline void nf_ct_offload_timeout(struct nf_conn *ct)
289{
290 if (nf_ct_expires(ct) < NF_CT_DAY / 2)
291 ct->timeout = nfct_time_stamp + NF_CT_DAY;
292}
293
282struct kernel_param;294struct kernel_param;
283 295
284int nf_conntrack_set_hashsize(const char *val, const struct kernel_param *kp);296int nf_conntrack_set_hashsize(const char *val, const struct kernel_param *kp);
net/netfilter/nf_conntrack_core.c+0−12
@@ -1344,18 +1344,6 @@ static bool gc_worker_can_early_drop(const struct nf_conn *ct) · 1343 unmodified lines
1344 return false;1344 return false;
1345}1345}
1346 1346
1347#define DAY (86400 * HZ)
1348
1349/* Set an arbitrary timeout large enough not to ever expire, this save
1350 * us a check for the IPS_OFFLOAD_BIT from the packet path via
1351 * nf_ct_is_expired().
1352 */
1353static void nf_ct_offload_timeout(struct nf_conn *ct)
1354{
1355 if (nf_ct_expires(ct) < DAY / 2)
1356 ct->timeout = nfct_time_stamp + DAY;
1357}
1358
1359static void gc_worker(struct work_struct *work)1347static void gc_worker(struct work_struct *work)
1360{1348{
1361 unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u);1349 unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t