Merge OpenBSD r1.104:
authorJoerg Sonnenberger <joerg@dragonflybsd.org>
Wed, 25 Jan 2006 02:47:09 +0000 (02:47 +0000)
committerJoerg Sonnenberger <joerg@dragonflybsd.org>
Wed, 25 Jan 2006 02:47:09 +0000 (02:47 +0000)
commitca60593c56cbf88ddea93e36ea5abdebef15161d
tree85e2de0dad949ebe26e280176c1fab2ab7c88ffb
parent103f7c1cb4b8bd4aa9decb46715d7e567f6d0630
Merge OpenBSD r1.104:
  fix a bug in the fragment cache (used for 'scrub fragment crop/drop-ovl',
  but not 'fragment reassemble'), which can cause some fragments to get
  inserted into the cache twice, thereby violating an invariant, and panic-
  ing the system subsequently. ok deraadt@

Reminded-by: Daniel Hartmeier
sys/net/pf/pf_norm.c