K 10
svn:author
V 7
rwatson
K 8
svn:date
V 27
2008-08-04T08:50:16.497833Z
K 7
svn:log
V 459
Merge r179781 from head to stable/7:

  The TrustedBSD MAC Framework named struct ipq instances 'ipq', which is the
  same as the global variable defined in ip_input.c.  Instead, adopt the name
  'q' as found in about 1/2 of uses in ip_input.c, preventing a collision on
  the name.  This is non-harmful, but means that search and replace on the
  global works less well (as in the virtualization work), as well as indexing
  tools.

  Reported by:    julian

END