d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix indentation in a loop and a tiny maze of #ifdefs for just the

Browse Source 
__FreeBSD__ parts that had it wrong.

MFC after:	3 days
This commit is contained in:
bz 2011-10-19 08:37:48 +00:00
parent c4e7df4e97
commit d8751c7f52
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
sys/contrib/pf/net/pf.c
View File

@ -1342,42 +1342,42 @@ pf_purge_thread(void *v)
tsleep(pf_purge_thread, PWAIT, "pftm", 1 * hz);
#ifdef __FreeBSD__
sx_slock(&V_pf_consistency_lock);
PF_LOCK();
locked = 0;
if (V_pf_end_threads) {
PF_UNLOCK();
sx_sunlock(&V_pf_consistency_lock);
sx_xlock(&V_pf_consistency_lock);
sx_slock(&V_pf_consistency_lock);
PF_LOCK();
locked = 0;
pf_purge_expired_states(V_pf_status.states, 1);
pf_purge_expired_fragments();
pf_purge_expired_src_nodes(1);
V_pf_end_threads++;
if (V_pf_end_threads) {
PF_UNLOCK();
sx_sunlock(&V_pf_consistency_lock);
sx_xlock(&V_pf_consistency_lock);
PF_LOCK();
sx_xunlock(&V_pf_consistency_lock);
PF_UNLOCK();
wakeup(pf_purge_thread);
kproc_exit(0);
}
pf_purge_expired_states(V_pf_status.states, 1);
pf_purge_expired_fragments();
pf_purge_expired_src_nodes(1);
V_pf_end_threads++;
sx_xunlock(&V_pf_consistency_lock);
PF_UNLOCK();
wakeup(pf_purge_thread);
kproc_exit(0);
}
#endif
s = splsoftnet();
/* process a fraction of the state table every second */
#ifdef __FreeBSD__
if (!pf_purge_expired_states(1 + (V_pf_status.states /
V_pf_default_rule.timeout[PFTM_INTERVAL]), 0)) {
PF_UNLOCK();
sx_sunlock(&V_pf_consistency_lock);
sx_xlock(&V_pf_consistency_lock);
PF_LOCK();
locked = 1;
if (!pf_purge_expired_states(1 + (V_pf_status.states /
V_pf_default_rule.timeout[PFTM_INTERVAL]), 0)) {
PF_UNLOCK();
sx_sunlock(&V_pf_consistency_lock);
sx_xlock(&V_pf_consistency_lock);
PF_LOCK();
locked = 1;
pf_purge_expired_states(1 + (V_pf_status.states /
V_pf_default_rule.timeout[PFTM_INTERVAL]), 1);
}
pf_purge_expired_states(1 + (V_pf_status.states /
V_pf_default_rule.timeout[PFTM_INTERVAL]), 1);
}
#else
pf_purge_expired_states(1 + (pf_status.states
/ pf_default_rule.timeout[PFTM_INTERVAL]));