diff options
author | glebius <glebius@FreeBSD.org> | 2014-03-05 01:17:47 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2014-03-05 01:17:47 +0000 |
commit | 8a3e4bbebb00c94db1ecf732ad3a6e3aa982384d (patch) | |
tree | c94a610c690dc0167aec575edf34ac5b23f1f498 /sys/netinet/ip_ipsec.c | |
parent | c23c087e5b36b9341d9242aae6bd8eb7835dfd43 (diff) | |
download | FreeBSD-src-8a3e4bbebb00c94db1ecf732ad3a6e3aa982384d.zip FreeBSD-src-8a3e4bbebb00c94db1ecf732ad3a6e3aa982384d.tar.gz |
- Remove rt_metrics_lite and simply put its members into rtentry.
- Use counter(9) for rt_pksent (former rt_rmx.rmx_pksent). This
removes another cache trashing ++ from packet forwarding path.
- Create zini/fini methods for the rtentry UMA zone. Via initialize
mutex and counter in them.
- Fix reporting of rmx_pksent to routing socket.
- Fix netstat(1) to report "Use" both in kvm(3) and sysctl(3) mode.
The change is mostly targeted for stable/10 merge. For head,
rt_pksent is expected to just disappear.
Discussed with: melifaro
Sponsored by: Netflix
Sponsored by: Nginx, Inc.
Diffstat (limited to 'sys/netinet/ip_ipsec.c')
-rw-r--r-- | sys/netinet/ip_ipsec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/netinet/ip_ipsec.c b/sys/netinet/ip_ipsec.c index ee93d9f..6bd42c0 100644 --- a/sys/netinet/ip_ipsec.c +++ b/sys/netinet/ip_ipsec.c @@ -237,9 +237,7 @@ ip_ipsec_mtu(struct mbuf *m, int mtu) sp->req->sav->sah != NULL) { ro = &sp->req->sav->sah->route_cache.sa_route; if (ro->ro_rt && ro->ro_rt->rt_ifp) { - mtu = - ro->ro_rt->rt_rmx.rmx_mtu ? - ro->ro_rt->rt_rmx.rmx_mtu : + mtu = ro->ro_rt->rt_mtu ? ro->ro_rt->rt_mtu : ro->ro_rt->rt_ifp->if_mtu; mtu -= ipsechdr; } |