Module Name: src Committed By: ozaki-r Date: Tue Oct 20 07:35:15 UTC 2015
Modified Files: src/sys/net: if_llatbl.c src/sys/netinet: if_arp.c Log Message: Stop using softnet_lock (fix possible deadlock) Using softnet_lock for mutual exclusion between lltable_free and arptimer was wrong and had an issue causing a deadlock between them; lltable_free waits arptimer completion by calling callout_halt with softnet_lock that is held in arptimer, however lltable_free also holds llentry's lock that is also held in arptimer so arptimer never obtain the lock and both never go forward eventually. We have to pass llentry's lock to callout_halt instead. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/net/if_llatbl.c cvs rdiff -u -r1.189 -r1.190 src/sys/netinet/if_arp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.