]> CyberLeo.Net >> Repos - FreeBSD/stable/9.git/commit
Merge r241908, r242632
authormelifaro <melifaro@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Fri, 21 Dec 2012 22:48:12 +0000 (22:48 +0000)
committermelifaro <melifaro@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Fri, 21 Dec 2012 22:48:12 +0000 (22:48 +0000)
commita427494183b654d5c384ecddc36bfcf176c57c48
treeb88afb600b8e179cd50dfbf04cc33ecbb493b1f2
parentfd5cc42272b34f1d043fb00c499ed40b2d72d756
Merge r241908, r242632

Remove unnecessary chain read lock in ipfw nat 'global' code.
Document case when ipfw chain lock must be held while calling ipfw_nat().

git-svn-id: svn://svn.freebsd.org/base/stable/9@244569 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
sys/netpfil/ipfw/ip_fw_nat.c
sys/netpfil/ipfw/ip_fw_private.h