summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuiz Otavio O Souza <luiz@netgate.com>2016-04-17 23:11:56 -0500
committerLuiz Otavio O Souza <luiz@netgate.com>2016-04-17 23:16:06 -0500
commit3110597967c3678456442b8aa9ad352c32ae787d (patch)
treee2b5f631d82ec22eeee4bb201d6cea64e164e5a4
parenta6794392b2381d1cc5a8f6aac5d5dc51712e24fd (diff)
downloadFreeBSD-src-3110597967c3678456442b8aa9ad352c32ae787d.zip
FreeBSD-src-3110597967c3678456442b8aa9ad352c32ae787d.tar.gz
Fix a bug in divert.RELENG_10.diff.
Found during the patch reviews for 2.4. (cherry picked from commit ea9ba1a51b165fe4540662a900bb800f501bdf74)
-rw-r--r--sys/netpfil/pf/pf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index ebda220..280c78a 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -6549,7 +6549,7 @@ done:
continueprocessing:
if (action == PF_PASS && r->divert.port && ip_divert_ptr != NULL &&
- !PACKET_LOOPED(&pd)) {
+ !PACKET_LOOPED(pd.pf_mtag)) {
if (!r->spare2 ||
(s && s->packets[dir == PF_OUT] <= r->spare2)) {
ipfwtag = m_tag_alloc(MTAG_IPFW_RULE, 0,
OpenPOWER on IntegriCloud