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/netatalk | |
| 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/netatalk')
| -rw-r--r-- | sys/netatalk/at_proto.c | 1 | ||||
| -rw-r--r-- | sys/netatalk/ddp_output.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sys/netatalk/at_proto.c b/sys/netatalk/at_proto.c index f62df59..00eb4eb 100644 --- a/sys/netatalk/at_proto.c +++ b/sys/netatalk/at_proto.c @@ -24,6 +24,7 @@ */ #include <sys/param.h> +#include <sys/systm.h> #include <sys/protosw.h> #include <sys/domain.h> #include <sys/socket.h> diff --git a/sys/netatalk/ddp_output.c b/sys/netatalk/ddp_output.c index 2b53de4..c52df96 100644 --- a/sys/netatalk/ddp_output.c +++ b/sys/netatalk/ddp_output.c @@ -221,7 +221,7 @@ ddp_route(struct mbuf *m, struct route *ro) elh->el_type = ELAP_DDPEXTEND; elh->el_dnode = gate.sat_addr.s_node; } - ro->ro_rt->rt_use++; + counter_u64_add(ro->ro_rt->rt_pksent, 1); #ifdef NETATALK_DEBUG printf ("ddp_route: from %d.%d to %d.%d, via %d.%d (%s)\n", |
