diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2011-03-05 01:53:17 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2011-03-05 01:53:17 +0000 |
| commit | 92bfb370614773d7052c95a296f0983778a8ebd1 (patch) | |
| tree | 7822a93af1b8f79329e2106effa10b77a7711748 /sys/netinet | |
| parent | 7e30b1685c1e280d1ba41a5b72fb4b1c3a601cf0 (diff) | |
The function pf_tag_packet() never fails. Remove a redundant check
and make it void.
ok henning@, markus@, mcbride@
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ipsec_input.c | 5 | ||||
| -rw-r--r-- | sys/netinet/ipsec_output.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c index 1c565a10040..54cb2484778 100644 --- a/sys/netinet/ipsec_input.c +++ b/sys/netinet/ipsec_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec_input.c,v 1.99 2010/12/21 19:16:15 markus Exp $ */ +/* $OpenBSD: ipsec_input.c,v 1.100 2011/03/05 01:53:16 bluhm Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -574,8 +574,7 @@ ipsec_common_input_cb(struct mbuf *m, struct tdb *tdbp, int skip, int protoff, #if NPF > 0 /* Add pf tag if requested. */ - if (pf_tag_packet(m, tdbp->tdb_tag, -1)) - DPRINTF(("failed to tag ipsec packet\n")); + pf_tag_packet(m, tdbp->tdb_tag, -1); pf_pkt_addr_changed(m); #endif diff --git a/sys/netinet/ipsec_output.c b/sys/netinet/ipsec_output.c index 13601532e09..530b17336b4 100644 --- a/sys/netinet/ipsec_output.c +++ b/sys/netinet/ipsec_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec_output.c,v 1.43 2010/07/09 16:58:06 reyk Exp $ */ +/* $OpenBSD: ipsec_output.c,v 1.44 2011/03/05 01:53:16 bluhm Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu) * @@ -501,8 +501,7 @@ ipsp_process_done(struct mbuf *m, struct tdb *tdb) #if NPF > 0 /* Add pf tag if requested. */ - if (pf_tag_packet(m, tdb->tdb_tag, -1)) - DPRINTF(("failed to tag ipsec packet\n")); + pf_tag_packet(m, tdb->tdb_tag, -1); pf_pkt_addr_changed(m); #endif |