diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2015-05-23 12:53:00 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2015-05-23 12:53:00 +0000 |
| commit | 6d1649d6c8efe5e83650695f35c7ea483dce1627 (patch) | |
| tree | aa9d18dad2bbe38c111e5eceb61f7604264be31c /sys/netinet | |
| parent | c5c3b04eba7e7ace6db10b6bb91112148249a324 (diff) | |
remove PACKET_TAG_IPSEC_PENDING_TDB, it is never set; ok mikeb@
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ip_output.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 4ec5b23e667..625c69578a1 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_output.c,v 1.280 2015/05/13 10:42:46 jsg Exp $ */ +/* $OpenBSD: ip_output.c,v 1.281 2015/05/23 12:52:59 markus Exp $ */ /* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */ /* @@ -229,23 +229,8 @@ reroute: goto done_spd; /* Do we have any pending SAs to apply ? */ - mtag = m_tag_find(m, PACKET_TAG_IPSEC_PENDING_TDB, NULL); - if (mtag != NULL) { -#ifdef DIAGNOSTIC - if (mtag->m_tag_len != sizeof (struct tdb_ident)) - panic("ip_output: tag of length %hu (should be %zu", - mtag->m_tag_len, sizeof (struct tdb_ident)); -#endif - tdbi = (struct tdb_ident *)(mtag + 1); - tdb = gettdb(tdbi->rdomain, - tdbi->spi, &tdbi->dst, tdbi->proto); - if (tdb == NULL) - error = -EINVAL; - m_tag_delete(m, mtag); - } - else - tdb = ipsp_spd_lookup(m, AF_INET, hlen, &error, - IPSP_DIRECTION_OUT, NULL, inp, ipsecflowinfo); + tdb = ipsp_spd_lookup(m, AF_INET, hlen, &error, + IPSP_DIRECTION_OUT, NULL, inp, ipsecflowinfo); if (tdb == NULL) { if (error == 0) { |