MFC r226527:

MFC r226527:

  Fix indentation in a loop and a tiny maze of #ifdefs for just the
  __FreeBSD__ parts that had it wrong.

MFC r226530:

  Fix a bug when NPFSYNC > 0 that on FreeBSD we would always return
  and never remove state.

  This fixes the problem some people are seeing that state is removed when pf
  is loaded as a module but not in situations when compiled into the kernel.

Approved by:	re (kib)

git-svn-id: svn://svn.freebsd.org/base/stable/9@226796 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f