diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2016-11-02 00:26:10 -0500 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2017-07-17 21:43:13 -0500 |
| commit | f2a90e770e3547494aa1a236243845399cf3f151 (patch) | |
| tree | 5ad41930840b2e756aee4a729e647a6532481ee4 | |
| parent | e38be777ef9e0ed4c4623460d5312439bb73b7b3 (diff) | |
| download | FreeBSD-src-f2a90e770e3547494aa1a236243845399cf3f151.zip FreeBSD-src-f2a90e770e3547494aa1a236243845399cf3f151.tar.gz | |
Fix the build.
(cherry picked from commit da345171c852e8ab229591c46daef6bf3c0c676e)
| -rw-r--r-- | sys/netpfil/pf/pf.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index ba241f9..bda85f1 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -6263,8 +6263,6 @@ pf_test(int dir, struct ifnet *ifp, struct mbuf **m0, struct inpcb *inp) if ((ip_divert_ptr != NULL || ip_dn_io_ptr != NULL) && ((ipfwtag = m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL)) != NULL)) { - struct ipfw_rule_ref *rr = (struct ipfw_rule_ref *)(ipfwtag+1); - if (pd.pf_mtag == NULL && ((pd.pf_mtag = pf_get_mtag(m)) == NULL)) { action = PF_DROP; @@ -6751,8 +6749,6 @@ pf_test6(int dir, struct ifnet *ifp, struct mbuf **m0, struct inpcb *inp) if (ip_dn_io_ptr != NULL && ((dn_tag = m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL)) != NULL)) { - struct ipfw_rule_ref *rr = (struct ipfw_rule_ref *)(dn_tag+1); - if (pd.pf_mtag == NULL && ((pd.pf_mtag = pf_get_mtag(m)) == NULL)) { action = PF_DROP; @@ -7058,7 +7054,7 @@ done: /* XXX: ipfw has the same behaviour! */ action = PF_DROP; REASON_SET(&reason, PFRES_MEMORY); - if ((pd.act.dnpipe || pd.act.pdnpipe) && !PACKET_LOOPED(&pd)) { + else if ((pd.act.dnpipe || pd.act.pdnpipe) && !PACKET_LOOPED(&pd)) { if (dir != r->direction && pd.act.pdnpipe) { dnflow.rule.info = pd.act.pdnpipe; } else if (dir == r->direction && pd.act.dnpipe) { |
