diff options
author | ae <ae@FreeBSD.org> | 2014-04-23 11:22:54 +0000 |
---|---|---|
committer | ae <ae@FreeBSD.org> | 2014-04-23 11:22:54 +0000 |
commit | a243d13ce71e97e2c1b78efbcebf9acfe1e39e62 (patch) | |
tree | b7e26e5f786cdc62c406b02ff0800ccffa8445f5 /sys/netipsec/ipsec_output.c | |
parent | 8057942ba8ed9b21af24960f0a246d99cc80a3ec (diff) | |
download | FreeBSD-src-a243d13ce71e97e2c1b78efbcebf9acfe1e39e62.zip FreeBSD-src-a243d13ce71e97e2c1b78efbcebf9acfe1e39e62.tar.gz |
MFC r264124:
Remove dead code.
MFC r264125:
Remove unused variable.
MFC r264126:
The check for local address spoofing lacks ifaddr locking.
Remove these loops and use in_localip() and in6_localip()
functions instead.
MFC r264520:
Remove _IP_VHL* macros and related ifdefs.
Diffstat (limited to 'sys/netipsec/ipsec_output.c')
-rw-r--r-- | sys/netipsec/ipsec_output.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sys/netipsec/ipsec_output.c b/sys/netipsec/ipsec_output.c index 19b27ec..a394590 100644 --- a/sys/netipsec/ipsec_output.c +++ b/sys/netipsec/ipsec_output.c @@ -205,11 +205,7 @@ ipsec_process_done(struct mbuf *m, struct ipsecrequest *isr) */ if (sav->natt_type) { struct ip *ip = mtod(m, struct ip *); -#ifdef _IP_VHL - const int hlen = IP_VHL_HL(ip->ip_vhl); -#else const int hlen = (ip->ip_hl << 2); -#endif int size, off; struct mbuf *mi; struct udphdr *udp; @@ -504,15 +500,7 @@ ipsec4_process_packet( ip = mtod(m, struct ip *); ip->ip_len = htons(m->m_pkthdr.len); ip->ip_sum = 0; -#ifdef _IP_VHL - if (ip->ip_vhl == IP_VHL_BORING) - ip->ip_sum = in_cksum_hdr(ip); - else - ip->ip_sum = in_cksum(m, - _IP_VHL_HL(ip->ip_vhl) << 2); -#else ip->ip_sum = in_cksum(m, ip->ip_hl << 2); -#endif /* Encapsulate the packet */ error = ipip_output(m, isr, &mp, 0, 0); |