diff options
| author | Luiz Souza <luiz@netgate.com> | 2017-08-09 10:57:48 -0500 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2017-08-09 11:03:53 -0500 |
| commit | dd94b3647551cf7e5d6062fda99cd5b2efd46b9e (patch) | |
| tree | 77fa6ca5a040f0d31c6010634f49dc4d7187b347 /sys/netpfil/pf | |
| parent | ee3875603445b55d9191175188bffbfb8a127092 (diff) | |
| download | FreeBSD-src-dd94b3647551cf7e5d6062fda99cd5b2efd46b9e.zip FreeBSD-src-dd94b3647551cf7e5d6062fda99cd5b2efd46b9e.tar.gz | |
Fix the import of the pf_match patch.
Ticket #7116
(cherry picked from commit 713562395203d4c40981e0a56121ffd611329bce)
Diffstat (limited to 'sys/netpfil/pf')
| -rw-r--r-- | sys/netpfil/pf/pf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 2570864..2a674c8 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -6418,7 +6418,7 @@ done: pd.act.pqid = r->pqid; pd.act.qid = r->qid; } - if (action == PF_PASS && r->qid) { + if (action == PF_PASS && pd.act.qid) { if (pd.pf_mtag == NULL && ((pd.pf_mtag = pf_get_mtag(m)) == NULL)) { action = PF_DROP; @@ -6427,9 +6427,9 @@ done: if (s != NULL) pd.pf_mtag->qid_hash = pf_state_hash(s); if (pqid || (pd.tos & IPTOS_LOWDELAY)) - pd.pf_mtag->qid = r->pqid; + pd.pf_mtag->qid = pd.act.pqid; else - pd.pf_mtag->qid = r->qid; + pd.pf_mtag->qid = pd.act.qid; /* Add hints for ecn. */ pd.pf_mtag->hdr = h; } |
