svn commit: r220811 - stable/8/sys/netinet/ipfw

[Andrey V. Elsukov]

Author: ae
Date: Tue Apr 19 05:09:17 2011
New Revision: 220811
URL: http://svn.freebsd.org/changeset/base/220811

Log:
  MFC r220568:
    Restore previous behaviour - always match rule when we doing tagging,
    even when tag is already exists.
  
    Reported by:	Vadim Goncharov

Modified:
  stable/8/sys/netinet/ipfw/ip_fw2.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/netinet/ipfw/ip_fw2.c
==============================================================================
--- stable/8/sys/netinet/ipfw/ip_fw2.c	Tue Apr 19 01:09:51 2011	(r220810)
+++ stable/8/sys/netinet/ipfw/ip_fw2.c	Tue Apr 19 05:09:17 2011	(r220811)
@@ -1793,10 +1793,13 @@ do {								\
 					if (mtag != NULL)
 						m_tag_delete(m, mtag);
 					match = 0;
-				} else if (mtag == NULL) {
-					if ((mtag = m_tag_alloc(MTAG_IPFW,
-					    tag, 0, M_NOWAIT)) != NULL)
-						m_tag_prepend(m, mtag);
+				} else {
+					if (mtag == NULL) {
+						mtag = m_tag_alloc( MTAG_IPFW,
+						    tag, 0, M_NOWAIT);
+						if (mtag != NULL)
+							m_tag_prepend(m, mtag);
+					}
 					match = 1;
 				}
 				break;