diff options
| author | ae <ae@FreeBSD.org> | 2015-06-02 03:14:42 +0000 |
|---|---|---|
| committer | ae <ae@FreeBSD.org> | 2015-06-02 03:14:42 +0000 |
| commit | fcbaea954867d54540644ca91c5c45fa835060d6 (patch) | |
| tree | 363e3402c6231f65ac872079c15244ba777cd8c8 /sys/netinet6 | |
| parent | f780971d9351b1bff9f79ea9876a4eb1d3def6ba (diff) | |
| download | FreeBSD-src-fcbaea954867d54540644ca91c5c45fa835060d6.zip FreeBSD-src-fcbaea954867d54540644ca91c5c45fa835060d6.tar.gz | |
MFC r275392:
Remove route chaching support from ipsec code. It isn't used for some time.
* remove sa_route_union declaration and route_cache member from struct secashead;
* remove key_sa_routechange() call from ICMP and ICMPv6 code;
* simplify ip_ipsec_mtu();
* remove #include <net/route.h>;
Sponsored by: Yandex LLC
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/icmp6.c | 9 | ||||
| -rw-r--r-- | sys/netinet6/ip6_ipsec.c | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index abf1a0a..85e29db 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_ipsec.h" #include <sys/param.h> #include <sys/domain.h> @@ -107,11 +106,6 @@ __FBSDID("$FreeBSD$"); #include <netinet6/nd6.h> #include <netinet6/send.h> -#ifdef IPSEC -#include <netipsec/ipsec.h> -#include <netipsec/key.h> -#endif - extern struct domain inet6domain; VNET_PCPUSTAT_DEFINE(struct icmp6stat, icmp6stat); @@ -2503,9 +2497,6 @@ icmp6_redirect_input(struct mbuf *m, int off) sdst.sin6_len = sizeof(struct sockaddr_in6); bcopy(&reddst6, &sdst.sin6_addr, sizeof(struct in6_addr)); pfctlinput(PRC_REDIRECT_HOST, (struct sockaddr *)&sdst); -#ifdef IPSEC - key_sa_routechange((struct sockaddr *)&sdst); -#endif /* IPSEC */ } freeit: diff --git a/sys/netinet6/ip6_ipsec.c b/sys/netinet6/ip6_ipsec.c index 2509e09..ea47566 100644 --- a/sys/netinet6/ip6_ipsec.c +++ b/sys/netinet6/ip6_ipsec.c @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include <sys/syslog.h> #include <net/if.h> -#include <net/route.h> #include <net/vnet.h> #include <netinet/in.h> |
