diff options
| author | glebius <glebius@FreeBSD.org> | 2014-03-21 15:15:30 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2014-03-21 15:15:30 +0000 |
| commit | 03fdc2934eb61c44c049a02b02aa974cfdd8a0eb (patch) | |
| tree | cc0fec78da85e9575659f55226fa9d0d7e1fb82c /sys/netinet/tcp_subr.c | |
| parent | a528b1ed30bfe465bfdd83f8e18449b8bf399429 (diff) | |
| download | FreeBSD-src-03fdc2934eb61c44c049a02b02aa974cfdd8a0eb.zip FreeBSD-src-03fdc2934eb61c44c049a02b02aa974cfdd8a0eb.tar.gz | |
Merge r262763, r262767, r262771, r262806 from head:
- 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.
Diffstat (limited to 'sys/netinet/tcp_subr.c')
| -rw-r--r-- | sys/netinet/tcp_subr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 2400c80..4a9cece 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1797,10 +1797,10 @@ tcp_maxmtu(struct in_conninfo *inc, struct tcp_ifcap *cap) } if (sro.ro_rt != NULL) { ifp = sro.ro_rt->rt_ifp; - if (sro.ro_rt->rt_rmx.rmx_mtu == 0) + if (sro.ro_rt->rt_mtu == 0) maxmtu = ifp->if_mtu; else - maxmtu = min(sro.ro_rt->rt_rmx.rmx_mtu, ifp->if_mtu); + maxmtu = min(sro.ro_rt->rt_mtu, ifp->if_mtu); /* Report additional interface capabilities. */ if (cap != NULL) { @@ -1834,10 +1834,10 @@ tcp_maxmtu6(struct in_conninfo *inc, struct tcp_ifcap *cap) } if (sro6.ro_rt != NULL) { ifp = sro6.ro_rt->rt_ifp; - if (sro6.ro_rt->rt_rmx.rmx_mtu == 0) + if (sro6.ro_rt->rt_mtu == 0) maxmtu = IN6_LINKMTU(sro6.ro_rt->rt_ifp); else - maxmtu = min(sro6.ro_rt->rt_rmx.rmx_mtu, + maxmtu = min(sro6.ro_rt->rt_mtu, IN6_LINKMTU(sro6.ro_rt->rt_ifp)); /* Report additional interface capabilities. */ |
