Author: ae
Date: Tue Apr 12 15:20:34 2011
New Revision: 220568
URL: http://svn.freebsd.org/changeset/base/220568
Log:
Restore previous behaviour - always match rule when we doing tagging,
even when tag is already exists.
Reported by: Vadim Goncharov
MFC after: 1 week
Modified:
head/sys/netinet/ipfw/ip_fw2.c
Modified: head/sys/netinet/ipfw/ip_fw2.c
==============================================================================
--- head/sys/netinet/ipfw/ip_fw2.c Tue Apr 12 12:57:46 2011
(r220567)
+++ head/sys/netinet/ipfw/ip_fw2.c Tue Apr 12 15:20:34 2011
(r220568)
@@ -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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
