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

- When carp interface is destroyed, and it affects global preemption

Browse Source 
suppresion counter, decrease the latter. [1]
- Add sysctl to monitor preemption suppression.

PR:		kern/80972 [1]
Submitted by:	Frank Volf [1]
MFC after:	1 week
This commit is contained in:
Gleb Smirnoff 2005-05-15 01:44:26 +00:00
parent ac97b33fc7
commit 32247f8629
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=146226
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/netinet/ip_carp.c
View File

@ -140,6 +140,8 @@ SYSCTL_INT(_net_inet_carp, CARPCTL_LOG, log, CTLFLAG_RW,
&carp_opts[CARPCTL_LOG], 0, "log bad carp packets");
SYSCTL_INT(_net_inet_carp, CARPCTL_ARPBALANCE, arpbalance, CTLFLAG_RW,
&carp_opts[CARPCTL_ARPBALANCE], 0, "balance arp responses");
SYSCTL_INT(_net_inet_carp, OID_AUTO, suppress_preempt, CTLFLAG_RD,
&carp_suppress_preempt, 0, "Preemption is suppressed");
struct carpstats carpstats;
SYSCTL_STRUCT(_net_inet_carp, CARPCTL_STATS, stats, CTLFLAG_RW,
@ -401,6 +403,15 @@ carp_clone_destroy(struct ifnet *ifp)
/* carpdetach(sc); */
/*
* If an interface is destroyed which is suppressing the preemption,
* decrease the global counter, otherwise the host will never get
* out of the carp supressing state.
*/
if (sc->sc_suppress)
carp_suppress_preempt--;
sc->sc_suppress = 0;
callout_stop(&sc->sc_ad_tmo);
callout_stop(&sc->sc_md_tmo);
callout_stop(&sc->sc_md6_tmo);