diff options
| author | Andrey V. Elsukov <ae@FreeBSD.org> | 2014-12-02 04:20:50 +0000 |
|---|---|---|
| committer | Andrey V. Elsukov <ae@FreeBSD.org> | 2014-12-02 04:20:50 +0000 |
| commit | 2d957916efd3c2be453b37e949d668d7d9a5fb49 (patch) | |
| tree | 4c6e8ce4ea18545a980665787e1aa8a7c635ea5e /sys/netinet6 | |
| parent | 1fea1b0889ffe8e42cc315484bafceee21c6ccf4 (diff) | |
| download | src-2d957916efd3c2be453b37e949d668d7d9a5fb49.tar.gz src-2d957916efd3c2be453b37e949d668d7d9a5fb49.zip | |
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
Notes
Notes:
svn path=/head/; revision=275392
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 84a1bc039e2b..0105479dcf54 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" #include "opt_inet6.h" -#include "opt_ipsec.h" #include <sys/param.h> #include <sys/domain.h> @@ -110,11 +109,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); @@ -2472,9 +2466,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 3e6d4df71ac1..78840edbe397 100644 --- a/sys/netinet6/ip6_ipsec.c +++ b/sys/netinet6/ip6_ipsec.c @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include <net/if.h> #include <net/if_var.h> -#include <net/route.h> #include <net/vnet.h> #include <netinet/in.h> |